diff --git a/src/installer/pkg/sfx/bundle/osx_resources/pt-br.lproj/conclusion.html b/src/installer/pkg/sfx/bundle/osx_resources/pt-br.lproj/conclusion.html
index e16c4b3148bcd4..af3bf5fd20ea09 100644
--- a/src/installer/pkg/sfx/bundle/osx_resources/pt-br.lproj/conclusion.html
+++ b/src/installer/pkg/sfx/bundle/osx_resources/pt-br.lproj/conclusion.html
@@ -5,7 +5,7 @@
-
The following was installed at /usr/local/share/dotnet
+
The following was installed
diff --git a/src/installer/pkg/sfx/installers/dotnet-host.proj b/src/installer/pkg/sfx/installers/dotnet-host.proj
index 953b0f4f8522f9..184770cb8c6089 100644
--- a/src/installer/pkg/sfx/installers/dotnet-host.proj
+++ b/src/installer/pkg/sfx/installers/dotnet-host.proj
@@ -4,6 +4,7 @@
true
dotnet-host
dotnet-host-internal
+
/
Host
NetCore.SharedHost
true
@@ -11,21 +12,27 @@
sharedhost
Dotnet_CLI_SharedHost
HostSrc
+
afterInstallExecute
false
true
sharedhost
false
-
osx_scripts/host
+
osx_scripts/host
The .NET Shared Host.
-
$(MSBuildThisFileDirectory)rpm_scripts/host
-
$(RpmScriptsDirectory)/after_install.sh
-
$(RpmScriptsDirectory)/after_remove.sh
+
+
{FD6988BF-5CCB-4202-3752-072442B1070B}
+
{97C9F490-5379-6902-7B80-D2723CA59D95}
+
{181630A5-53EA-4D70-E563-06F64946DE38}
+
+
+
+
@@ -35,21 +42,37 @@
+
+ <_DestinationPath>$(OutputPath)
+ <_DestinationPath Condition="'$(BuildRpmPackage)' == 'true'">$(OutputPath)usr/share/dotnet/
+ <_UsrBinPath>$(OutputPath)usr/bin/
+
+
+
+
+
+ Destination="$(_DestinationPath)dotnet$(ExeSuffix)" />
+ Destination="$(_DestinationPath)ThirdPartyNotices.txt" />
+
+
+
+
@@ -71,11 +94,43 @@
-
-
+
+
+ <_MacOSIntermediatesPath>$(IntermediateOutputPath)macos/
+
+ $(_MacOSIntermediatesPath)scripts
+
+
+ <_MacOSScript Include="$(MacOSScriptsTemplateDirectory)/*" Destination="$(MacOSScriptsDirectory)/%(FileName)%(Extension)"/>
+
+
+
+
+ <_UnameMachineRegex>$(InstallerTargetArchitecture)
+ <_UnameMachineRegex Condition="'$(InstallerTargetArchitecture)' == 'arm64'">arm64|aarch64
+ <_UnameMachineRegex Condition="'$(InstallerTargetArchitecture)' == 'x64'">amd64|x86_64
+ <_MacOSScriptsTemplateProperties>InstallerTargetArchitecture=$(InstallerTargetArchitecture);UnameMachineRegex=$(_UnameMachineRegex)
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/installer/pkg/sfx/installers/dotnet-hostfxr.proj b/src/installer/pkg/sfx/installers/dotnet-hostfxr.proj
index 2c5fa5d8188867..b9eb792a38fade 100644
--- a/src/installer/pkg/sfx/installers/dotnet-hostfxr.proj
+++ b/src/installer/pkg/sfx/installers/dotnet-hostfxr.proj
@@ -14,7 +14,6 @@
HostFxrSrc
true
hostfxr
- osx_scripts/hostfxr
The .NET HostFxr
diff --git a/src/installer/pkg/sfx/installers/host.wxs b/src/installer/pkg/sfx/installers/host.wxs
index 773246beb70f1a..6ff59fa6c29c83 100644
--- a/src/installer/pkg/sfx/installers/host.wxs
+++ b/src/installer/pkg/sfx/installers/host.wxs
@@ -24,8 +24,29 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ NOT NON_NATIVE_ARCHITECTURE
+
+
+
-
+
@@ -47,6 +68,16 @@
+
+
+
+
-
-
+
+
+
+
+ NON_NATIVE_ARCHITECTURE
+
+
+
\ No newline at end of file
diff --git a/src/installer/pkg/sfx/installers/osx_scripts/host/postinstall b/src/installer/pkg/sfx/installers/osx_scripts/host/postinstall
index 531cb93fd382fc..3eba436d925092 100755
--- a/src/installer/pkg/sfx/installers/osx_scripts/host/postinstall
+++ b/src/installer/pkg/sfx/installers/osx_scripts/host/postinstall
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
#
# Licensed to the .NET Foundation under one or more agreements.
# The .NET Foundation licenses this file to you under the MIT license.
@@ -6,13 +6,23 @@
PACKAGE=$1
INSTALL_DESTINATION=$2
+[ "${InstallerTargetArchitecture}" == "x64" ] && X64_INSTALL_DESTINATION=$2 || X64_INSTALL_DESTINATION=$2/x64
# A temporary fix for the permissions issue(s)
chmod 755 $INSTALL_DESTINATION/dotnet
-# Add the installation directory to the system-wide paths
-# But first create the directory if it doesn't exist
-mkdir -p /etc/paths.d
-echo $INSTALL_DESTINATION | tee /etc/paths.d/dotnet
+mkdir -p /etc/dotnet
+# set install_location (legacy location) to x64 location (regardless of wether or not we're installing x64)
+echo $X64_INSTALL_DESTINATION | tee /etc/dotnet/install_location
+# set install_location_arch to point to this installed location
+echo $INSTALL_DESTINATION | tee /etc/dotnet/install_location_${InstallerTargetArchitecture}
+
+# if we're running on the native architecture
+if [[ "$(uname -m)" =~ ${UnameMachineRegex} && "$(sysctl -i -n sysctl.proc_translated)" != "1" ]]; then
+ # Add the installation directory to the system-wide paths
+ # But first create the directory if it doesn't exist
+ mkdir -p /etc/paths.d
+ echo $INSTALL_DESTINATION | tee /etc/paths.d/dotnet
+fi
exit 0
diff --git a/src/installer/pkg/sfx/installers/osx_scripts/hostfxr/postinstall b/src/installer/pkg/sfx/installers/osx_scripts/hostfxr/postinstall
deleted file mode 100755
index 2d0ceb82786936..00000000000000
--- a/src/installer/pkg/sfx/installers/osx_scripts/hostfxr/postinstall
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-#
-# Licensed to the .NET Foundation under one or more agreements.
-# The .NET Foundation licenses this file to you under the MIT license.
-#
-
-PACKAGE=$1
-INSTALL_DESTINATION=$2
-
-# A temporary fix for the permissions issue(s)
-chmod 755 $INSTALL_DESTINATION/dotnet
-
-# Add the installation directory to the system-wide paths
-echo $INSTALL_DESTINATION | tee /etc/paths.d/dotnet
-
-exit 0
diff --git a/src/installer/prepare-artifacts.proj b/src/installer/prepare-artifacts.proj
index 159125bc2d03d5..228c234ae4ff0e 100644
--- a/src/installer/prepare-artifacts.proj
+++ b/src/installer/prepare-artifacts.proj
@@ -122,6 +122,10 @@
$(InstallersRelativePath)workloads/$(SdkBandVersion)/%(Filename)%(Extension)
true
+
+
+
+
diff --git a/src/installer/tests/Assets/TestProjects/AppWithSubDirs/Program.cs b/src/installer/tests/Assets/TestProjects/AppWithSubDirs/Program.cs
index c1a31dec98665a..0a5d0149fff216 100644
--- a/src/installer/tests/Assets/TestProjects/AppWithSubDirs/Program.cs
+++ b/src/installer/tests/Assets/TestProjects/AppWithSubDirs/Program.cs
@@ -12,6 +12,21 @@ public static void Main(string[] args)
{
string baseDir = Path.Combine(AppContext.BaseDirectory, "Sentence");
+ // singlefile app redirects a number of known internal PInvokes to their implementations
+ // which are statically linked into the host.
+ // Use of File IO, Console APIs and the like uses and tests those mechanisms extensively.
+ //
+ // There are also two PInvokes in the hostpolicy itself. Test them here.
+ // We are not looking for a success, just that we can get to these methods -
+ // we should not see errors like "Unable to find an entry point".
+ try
+ {
+ new System.Runtime.Loader.AssemblyDependencyResolver("qwerty");
+ }
+ catch (InvalidOperationException ex) when (ex.Message.Contains("Failed to locate managed application"))
+ {
+ }
+
string Part(string dir="", string subdir="", string subsubdir="")
{
return File.ReadAllText(Path.Combine(baseDir, dir, subdir, subsubdir, "word"));
diff --git a/src/installer/tests/HostActivation.Tests/FrameworkResolution/DotNetCliExtensions.cs b/src/installer/tests/HostActivation.Tests/FrameworkResolution/DotNetCliExtensions.cs
index 5a8830556f54b6..6f637a1f586907 100644
--- a/src/installer/tests/HostActivation.Tests/FrameworkResolution/DotNetCliExtensions.cs
+++ b/src/installer/tests/HostActivation.Tests/FrameworkResolution/DotNetCliExtensions.cs
@@ -77,7 +77,7 @@ public DotNetFramework RuntimeConfig(Action
runtimeConfigCustomiz
{
string runtimeConfigPath = Path.Combine(_path, _name + ".runtimeconfig.json");
_backup.Backup(runtimeConfigPath);
- RuntimeConfig runtimeConfig = HostActivation.RuntimeConfig.FromFile(runtimeConfigPath);
+ RuntimeConfig runtimeConfig = Test.RuntimeConfig.FromFile(runtimeConfigPath);
runtimeConfigCustomizer(runtimeConfig);
runtimeConfig.Save();
diff --git a/src/installer/tests/HostActivation.Tests/HostActivation.Tests.csproj b/src/installer/tests/HostActivation.Tests/HostActivation.Tests.csproj
index 55c14ce9d5a6b5..9724d3326e75a0 100644
--- a/src/installer/tests/HostActivation.Tests/HostActivation.Tests.csproj
+++ b/src/installer/tests/HostActivation.Tests/HostActivation.Tests.csproj
@@ -5,7 +5,6 @@
HostActivation.Tests
HostActivation.Tests
true
- $(DefineConstants);WINDOWS
ha
true
@@ -17,7 +16,6 @@
-
diff --git a/src/installer/tests/HostActivation.Tests/InstallLocationCommandResultExtensions.cs b/src/installer/tests/HostActivation.Tests/InstallLocationCommandResultExtensions.cs
index c85b7d3e56cc5d..c4a8438d8117e4 100644
--- a/src/installer/tests/HostActivation.Tests/InstallLocationCommandResultExtensions.cs
+++ b/src/installer/tests/HostActivation.Tests/InstallLocationCommandResultExtensions.cs
@@ -3,6 +3,7 @@
using System;
+using System.IO;
using System.Runtime.InteropServices;
using FluentAssertions;
using Microsoft.DotNet.Cli.Build.Framework;
@@ -45,14 +46,14 @@ public static AndConstraint HaveUsedGlobalInstallLocati
return assertion.HaveStdErrContaining($"Using global installation location [{installLocation}]");
}
- public static AndConstraint HaveFoundDefaultInstallLocationInConfigFile(this CommandResultAssertions assertion, string installLocation)
+ public static AndConstraint HaveLookedForDefaultInstallLocation(this CommandResultAssertions assertion, string installLocationPath)
{
- return assertion.HaveStdErrContaining($"Found install location path '{installLocation}'.");
+ return assertion.HaveStdErrContaining($"Looking for install_location file in '{Path.Combine(installLocationPath, "install_location")}'.");
}
- public static AndConstraint HaveFoundArchSpecificInstallLocationInConfigFile(this CommandResultAssertions assertion, string installLocation, string arch)
+ public static AndConstraint HaveLookedForArchitectureSpecificInstallLocation(this CommandResultAssertions assertion, string installLocationPath, string architecture)
{
- return assertion.HaveStdErrContaining($"Found architecture-specific install location path: '{installLocation}' ('{arch}').");
+ return assertion.HaveStdErrContaining($"Looking for architecture specific install_location file in '{Path.Combine(installLocationPath, "install_location_" + architecture.ToLowerInvariant())}'.");
}
}
}
diff --git a/src/installer/tests/HostActivation.Tests/MultiArchInstallLocation.cs b/src/installer/tests/HostActivation.Tests/MultiArchInstallLocation.cs
index 120b899cff451b..3829a30e682e09 100644
--- a/src/installer/tests/HostActivation.Tests/MultiArchInstallLocation.cs
+++ b/src/installer/tests/HostActivation.Tests/MultiArchInstallLocation.cs
@@ -71,6 +71,31 @@ public void EnvironmentVariable_ArchSpecificDotnetRootIsUsedOverDotnetRoot()
.And.NotHaveStdErrContaining("Using environment variable DOTNET_ROOT=");
}
+ [Fact]
+ public void EnvironmentVariable_DotNetRootIsUsedOverInstallLocationIfSet()
+ {
+ var fixture = sharedTestState.PortableAppFixture
+ .Copy();
+
+ var appExe = fixture.TestProject.AppExe;
+ var arch = fixture.RepoDirProvider.BuildArchitecture.ToUpper();
+ var dotnet = fixture.BuiltDotnet.BinPath;
+
+ using (var registeredInstallLocationOverride = new RegisteredInstallLocationOverride(appExe))
+ {
+ registeredInstallLocationOverride.SetInstallLocation((arch, "some/install/location"));
+
+ Command.Create(appExe)
+ .EnableTracingAndCaptureOutputs()
+ .ApplyRegisteredInstallLocationOverride(registeredInstallLocationOverride)
+ .DotNetRoot(dotnet, arch)
+ .Execute()
+ .Should().Pass()
+ .And.HaveUsedDotNetRootInstallLocation(dotnet, fixture.CurrentRid, arch)
+ .And.NotHaveStdErrContaining("Using global install location");
+ }
+ }
+
[Fact]
public void EnvironmentVariable_DotnetRootPathDoesNotExist()
{
@@ -122,7 +147,6 @@ public void EnvironmentVariable_DotnetRootPathExistsButHasNoHost()
}
[Fact]
- [SkipOnPlatform(TestPlatforms.Windows, "This test targets the install_location config file which is only used on Linux and macOS.")]
public void InstallLocationFile_ArchSpecificLocationIsPickedFirst()
{
var fixture = sharedTestState.PortableAppFixture
@@ -142,40 +166,19 @@ public void InstallLocationFile_ArchSpecificLocationIsPickedFirst()
(arch2, path2)
});
- Command.Create(appExe)
+ CommandResult result = Command.Create(appExe)
.EnableTracingAndCaptureOutputs()
.ApplyRegisteredInstallLocationOverride(registeredInstallLocationOverride)
.DotNetRoot(null)
- .Execute()
- .Should().HaveFoundDefaultInstallLocationInConfigFile(path1)
- .And.HaveFoundArchSpecificInstallLocationInConfigFile(path1, arch1)
- .And.HaveFoundArchSpecificInstallLocationInConfigFile(path2, arch2)
- .And.HaveUsedGlobalInstallLocation(path2);
- }
- }
+ .Execute();
- [Fact]
- [SkipOnPlatform(TestPlatforms.Windows, "This test targets the install_location config file which is only used on Linux and macOS.")]
- public void InstallLocationFile_OnlyFirstLineMayNotSpecifyArchitecture()
- {
- var fixture = sharedTestState.PortableAppFixture
- .Copy();
+ if (!OperatingSystem.IsWindows())
+ {
+ result.Should()
+ .HaveLookedForArchitectureSpecificInstallLocation(registeredInstallLocationOverride.PathValueOverride, arch2);
+ }
- var appExe = fixture.TestProject.AppExe;
- using (var registeredInstallLocationOverride = new RegisteredInstallLocationOverride(appExe))
- {
- registeredInstallLocationOverride.SetInstallLocation(new (string, string)[] {
- (string.Empty, "a/b/c"),
- (string.Empty, "x/y/z"),
- });
- Command.Create(appExe)
- .EnableTracingAndCaptureOutputs()
- .ApplyRegisteredInstallLocationOverride(registeredInstallLocationOverride)
- .DotNetRoot(null)
- .Execute()
- .Should().HaveFoundDefaultInstallLocationInConfigFile("a/b/c")
- .And.HaveStdErrContaining($"Only the first line in '{registeredInstallLocationOverride.PathValueOverride}' may not have an architecture prefix.")
- .And.HaveUsedConfigFileInstallLocation("a/b/c");
+ result.Should().HaveUsedGlobalInstallLocation(path2);
}
}
@@ -200,7 +203,7 @@ public void InstallLocationFile_ReallyLongInstallPathIsParsedCorrectly()
.ApplyRegisteredInstallLocationOverride(registeredInstallLocationOverride)
.DotNetRoot(null)
.Execute()
- .Should().HaveFoundDefaultInstallLocationInConfigFile(reallyLongPath)
+ .Should().HaveLookedForDefaultInstallLocation(registeredInstallLocationOverride.PathValueOverride)
.And.HaveUsedConfigFileInstallLocation(reallyLongPath);
}
}
@@ -218,16 +221,15 @@ public void InstallLocationFile_MissingFile()
{
Directory.CreateDirectory(testArtifactsPath);
- string directory = Path.Combine(testArtifactsPath, "installLocationOverride");
- Directory.CreateDirectory(directory);
- string nonExistentLocationFile = Path.Combine(directory, "install_location");
+ string installLocationDirectory = Path.Combine(testArtifactsPath, "installLocationOverride");
+ Directory.CreateDirectory(installLocationDirectory);
string defaultInstallLocation = Path.Combine(testArtifactsPath, "defaultInstallLocation");
Command.Create(appExe)
.CaptureStdErr()
.EnvironmentVariable(
- Constants.TestOnlyEnvironmentVariables.InstallLocationFilePath,
- nonExistentLocationFile)
+ Constants.TestOnlyEnvironmentVariables.InstallLocationPath,
+ installLocationDirectory)
.EnvironmentVariable(
Constants.TestOnlyEnvironmentVariables.DefaultInstallPath,
defaultInstallLocation)
diff --git a/src/installer/tests/HostActivation.Tests/NativeHostApis.cs b/src/installer/tests/HostActivation.Tests/NativeHostApis.cs
index aaabf8e571bcd2..d9feb540d70bce 100644
--- a/src/installer/tests/HostActivation.Tests/NativeHostApis.cs
+++ b/src/installer/tests/HostActivation.Tests/NativeHostApis.cs
@@ -461,6 +461,52 @@ public void Hostfxr_get_dotnet_environment_info_with_multilevel_lookup_only()
}
}
+ [Fact]
+ [PlatformSpecific(TestPlatforms.Windows)] // Multi-level lookup is only supported on Windows.
+ public void Hostfxr_get_dotnet_environment_info_with_multilevel_lookup_only_self_register_program_files()
+ {
+ var f = new SdkResolutionFixture(sharedTestState);
+
+ string expectedFrameworkNames = string.Join(';', new[]
+ {
+ "HostFxr.Test.A",
+ "HostFxr.Test.A",
+ "HostFxr.Test.B",
+ });
+
+ string expectedFrameworkVersions = string.Join(';', new[]
+ {
+ "1.2.3",
+ "3.0.0",
+ "5.6.7-A",
+ });
+
+ string expectedFrameworkPaths = string.Join(';', new[]
+ {
+ Path.Combine(f.ProgramFilesGlobalFrameworksDir, "HostFxr.Test.A"),
+ Path.Combine(f.ProgramFilesGlobalFrameworksDir, "HostFxr.Test.A"),
+ Path.Combine(f.ProgramFilesGlobalFrameworksDir, "HostFxr.Test.B"),
+ });
+
+ using (TestOnlyProductBehavior.Enable(f.Dotnet.GreatestVersionHostFxrFilePath))
+ {
+ // We pass f.WorkingDir so that we don't resolve dotnet_dir to the global installation
+ // in the native side.
+ f.Dotnet.Exec(f.AppDll, new[] { "hostfxr_get_dotnet_environment_info", f.WorkingDir })
+ .EnvironmentVariable("TEST_MULTILEVEL_LOOKUP_PROGRAM_FILES", f.ProgramFiles)
+ // Test with a self-registered path the same as ProgramFiles, with a trailing slash. Expect this to be de-duped
+ .EnvironmentVariable("TEST_MULTILEVEL_LOOKUP_SELF_REGISTERED", Path.Combine(f.ProgramFiles, "dotnet") + Path.DirectorySeparatorChar)
+ .CaptureStdOut()
+ .CaptureStdErr()
+ .Execute()
+ .Should().Pass()
+ .And.HaveStdOutContaining("hostfxr_get_dotnet_environment_info:Success")
+ .And.HaveStdOutContaining($"hostfxr_get_dotnet_environment_info framework names:[{expectedFrameworkNames}]")
+ .And.HaveStdOutContaining($"hostfxr_get_dotnet_environment_info framework versions:[{expectedFrameworkVersions}]")
+ .And.HaveStdOutContaining($"hostfxr_get_dotnet_environment_info framework paths:[{expectedFrameworkPaths}]");
+ }
+ }
+
[Fact]
public void Hostfxr_get_dotnet_environment_info_global_install_path()
{
diff --git a/src/installer/tests/HostActivation.Tests/NativeHosting/Nethost.cs b/src/installer/tests/HostActivation.Tests/NativeHosting/Nethost.cs
index 0af2ce34774127..792bf4faf6f8f6 100644
--- a/src/installer/tests/HostActivation.Tests/NativeHosting/Nethost.cs
+++ b/src/installer/tests/HostActivation.Tests/NativeHosting/Nethost.cs
@@ -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 HostActivation.Tests;
using Microsoft.DotNet.Cli.Build.Framework;
using System;
using System.IO;
@@ -88,6 +89,7 @@ public void GetHostFxrPath_DotNetRootParameter(bool explicitLoad, bool useAssemb
}
[Theory]
+ [ActiveIssue("https://github.com/dotnet/runtime/issues/61131", TestPlatforms.OSX)]
[InlineData(true, false, true, false)]
[InlineData(true, false, true, true)]
[InlineData(true, false, false, false)]
@@ -179,6 +181,7 @@ public void GetHostFxrPath_HostFxrAlreadyLoaded()
}
[Theory]
+ [ActiveIssue("https://github.com/dotnet/runtime/issues/61131", TestPlatforms.OSX)]
[SkipOnPlatform(TestPlatforms.Windows, "This test targets the install_location config file which is only used on Linux and macOS.")]
[InlineData("{0}", false, true)]
[InlineData("{0}\n", false, true)]
@@ -216,12 +219,21 @@ public void GetHostFxrPath_InstallLocationFile(string value, bool shouldUseArchS
.DotNetRoot(null)
.Execute();
- result.Should().HaveStdErrContaining($"Looking for install_location file in '{registeredInstallLocationOverride.PathValueOverride}'.");
+ if (shouldUseArchSpecificInstallLocation)
+ {
+ result.Should().HaveLookedForArchitectureSpecificInstallLocation(
+ registeredInstallLocationOverride.PathValueOverride,
+ sharedState.RepoDirectories.BuildArchitecture);
+ }
+ else
+ {
+ result.Should().HaveLookedForDefaultInstallLocation(registeredInstallLocationOverride.PathValueOverride);
+ }
if (shouldPass)
{
result.Should().Pass()
- .And.HaveStdErrContaining($"Using install location '{installLocation}'.")
+ .And.HaveUsedConfigFileInstallLocation(installLocation)
.And.HaveStdOutContaining($"hostfxr_path: {sharedState.HostFxrPath}".ToLower());
}
else
@@ -235,35 +247,7 @@ public void GetHostFxrPath_InstallLocationFile(string value, bool shouldUseArchS
}
[Fact]
- [SkipOnPlatform(TestPlatforms.Windows, "This test targets the install_location config file which is only used on Linux and macOS.")]
- public void GetHostFxrPath_GlobalInstallation_HasMoreThanOneDefaultInstallationPath()
- {
- string installLocation = Path.Combine(sharedState.ValidInstallRoot, "dotnet");
- using (var registeredInstallLocationOverride = new RegisteredInstallLocationOverride(sharedState.NethostPath))
- {
- registeredInstallLocationOverride.SetInstallLocation(new (string, string)[] {
- (string.Empty, installLocation), (string.Empty, installLocation)
- });
-
- CommandResult result = Command.Create(sharedState.NativeHostPath, GetHostFxrPath)
- .EnableTracingAndCaptureOutputs()
- .ApplyRegisteredInstallLocationOverride(registeredInstallLocationOverride)
- .EnvironmentVariable( // Redirect the default install location to an invalid location so that it doesn't cause the test to pass
- Constants.TestOnlyEnvironmentVariables.DefaultInstallPath,
- sharedState.InvalidInstallRoot)
- .DotNetRoot(null)
- .Execute();
-
- result.Should().Pass()
- .And.HaveStdErrContaining($"Looking for install_location file in '{registeredInstallLocationOverride.PathValueOverride}'.")
- .And.HaveStdErrContaining($"Found install location path '{installLocation}'.")
- .And.HaveStdErrContaining($"Only the first line in '{registeredInstallLocationOverride.PathValueOverride}' may not have an architecture prefix.")
- .And.HaveStdErrContaining($"Using install location '{installLocation}'.")
- .And.HaveStdOutContaining($"hostfxr_path: {sharedState.HostFxrPath}".ToLower());
- }
- }
-
- [Fact]
+ [ActiveIssue("https://github.com/dotnet/runtime/issues/61131", TestPlatforms.OSX)]
[SkipOnPlatform(TestPlatforms.Windows, "This test targets the install_location config file which is only used on Linux and macOS.")]
public void GetHostFxrPath_GlobalInstallation_HasNoDefaultInstallationPath()
{
@@ -285,14 +269,16 @@ public void GetHostFxrPath_GlobalInstallation_HasNoDefaultInstallationPath()
.Execute();
result.Should().Pass()
- .And.HaveStdErrContaining($"Looking for install_location file in '{registeredInstallLocationOverride.PathValueOverride}'.")
- .And.HaveStdErrContaining($"Found architecture-specific install location path: '{installLocation}' ('{sharedState.RepoDirectories.BuildArchitecture.ToLower()}').")
- .And.HaveStdErrContaining($"Using install location '{installLocation}'.")
+ .And.HaveLookedForArchitectureSpecificInstallLocation(
+ registeredInstallLocationOverride.PathValueOverride,
+ sharedState.RepoDirectories.BuildArchitecture)
+ .And.HaveUsedConfigFileInstallLocation(installLocation)
.And.HaveStdOutContaining($"hostfxr_path: {sharedState.HostFxrPath}".ToLower());
}
}
[Fact]
+ [ActiveIssue("https://github.com/dotnet/runtime/issues/61131", TestPlatforms.OSX)]
[SkipOnPlatform(TestPlatforms.Windows, "This test targets the install_location config file which is only used on Linux and macOS.")]
public void GetHostFxrPath_GlobalInstallation_ArchitectureSpecificPathIsPickedOverDefaultPath()
{
@@ -314,10 +300,10 @@ public void GetHostFxrPath_GlobalInstallation_ArchitectureSpecificPathIsPickedOv
.Execute();
result.Should().Pass()
- .And.HaveStdErrContaining($"Looking for install_location file in '{registeredInstallLocationOverride.PathValueOverride}'.")
- .And.HaveStdErrContaining($"Found install location path '{installLocation}/a/b/c'.")
- .And.HaveStdErrContaining($"Found architecture-specific install location path: '{installLocation}' ('{sharedState.RepoDirectories.BuildArchitecture.ToLower()}').")
- .And.HaveStdErrContaining($"Using install location '{installLocation}'.")
+ .And.HaveLookedForArchitectureSpecificInstallLocation(
+ registeredInstallLocationOverride.PathValueOverride,
+ sharedState.RepoDirectories.BuildArchitecture)
+ .And.HaveUsedConfigFileInstallLocation(installLocation)
.And.HaveStdOutContaining($"hostfxr_path: {sharedState.HostFxrPath}".ToLower());
}
}
diff --git a/src/installer/tests/HostActivation.Tests/PortableAppActivation.cs b/src/installer/tests/HostActivation.Tests/PortableAppActivation.cs
index 4b1b28e32f3ee2..b0b52d901efd2c 100644
--- a/src/installer/tests/HostActivation.Tests/PortableAppActivation.cs
+++ b/src/installer/tests/HostActivation.Tests/PortableAppActivation.cs
@@ -526,7 +526,7 @@ public void AppHost_GUI_FrameworkDependent_MissingRuntimeFramework_ErrorReported
.MultilevelLookup(false)
.Start();
- WaitForPopupFromProcess(command.Process);
+ WindowsUtils.WaitForPopupFromProcess(command.Process);
command.Process.Kill();
var result = command.WaitForExit(true)
@@ -559,7 +559,7 @@ public void AppHost_GUI_MissingRuntime_ErrorReportedInDialog()
.MultilevelLookup(false)
.Start();
- WaitForPopupFromProcess(command.Process);
+ WindowsUtils.WaitForPopupFromProcess(command.Process);
command.Process.Kill();
var expectedErrorCode = Constants.ErrorCode.CoreHostLibMissingFailure.ToString("x");
@@ -590,7 +590,7 @@ public void AppHost_GUI_NoCustomErrorWriter_FrameworkMissing_ErrorReportedInDial
Directory.CreateDirectory(dotnetWithMockHostFxr);
string expectedErrorCode = Constants.ErrorCode.FrameworkMissingFailure.ToString("x");
- var dotnetBuilder = new DotNetBuilder(dotnetWithMockHostFxr, sharedTestState.RepoDirectories.BuiltDotnet, "hostfxrFrameworkMissingFailure")
+ var dotnetBuilder = new DotNetBuilder(dotnetWithMockHostFxr, sharedTestState.RepoDirectories.BuiltDotnet, "mockhostfxrFrameworkMissingFailure")
.RemoveHostFxr()
.AddMockHostFxr(new Version(2, 2, 0));
var dotnet = dotnetBuilder.Build();
@@ -601,7 +601,7 @@ public void AppHost_GUI_NoCustomErrorWriter_FrameworkMissing_ErrorReportedInDial
.MultilevelLookup(false)
.Start();
- WaitForPopupFromProcess(command.Process);
+ WindowsUtils.WaitForPopupFromProcess(command.Process);
command.Process.Kill();
command.WaitForExit(true)
@@ -689,50 +689,6 @@ private string CreateAStore(TestProjectFixture testProjectFixture)
return storeoutputDirectory;
}
-#if WINDOWS
- private delegate bool EnumThreadWindowsDelegate(IntPtr hWnd, IntPtr lParam);
-
- [DllImport("user32.dll")]
- private static extern bool EnumThreadWindows(int dwThreadId, EnumThreadWindowsDelegate plfn, IntPtr lParam);
-
- private IntPtr WaitForPopupFromProcess(Process process, int timeout = 60000)
- {
- IntPtr windowHandle = IntPtr.Zero;
- int timeRemaining = timeout;
- while (timeRemaining > 0)
- {
- foreach (ProcessThread thread in process.Threads)
- {
- // We take the last window we find. There really should only be one at most anyways.
- EnumThreadWindows(thread.Id,
- (hWnd, lParam) => {
- windowHandle = hWnd;
- return true;
- },
- IntPtr.Zero);
- }
-
- if (windowHandle != IntPtr.Zero)
- {
- break;
- }
-
- System.Threading.Thread.Sleep(100);
- timeRemaining -= 100;
- }
-
- // Do not fail if the window could be detected, sometimes the check is fragile and doesn't work.
- // Not worth the trouble trying to figure out why (only happens rarely in the CI system).
- // We will rely on product tracing in the failure case.
- return windowHandle;
- }
-#else
- private IntPtr WaitForPopupFromProcess(Process process, int timeout = 60000)
- {
- throw new PlatformNotSupportedException();
- }
-#endif
-
public class SharedTestState : IDisposable
{
public TestProjectFixture PortableAppFixture_Built { get; }
diff --git a/src/installer/tests/HostActivation.Tests/RegisteredInstallLocationOverride.cs b/src/installer/tests/HostActivation.Tests/RegisteredInstallLocationOverride.cs
index d37cfafe649537..fcb29470d9eeb0 100644
--- a/src/installer/tests/HostActivation.Tests/RegisteredInstallLocationOverride.cs
+++ b/src/installer/tests/HostActivation.Tests/RegisteredInstallLocationOverride.cs
@@ -56,10 +56,11 @@ public RegisteredInstallLocationOverride(string productBinaryPath)
// On Linux/macOS the install location is registered in a file which is normally
// located in /etc/dotnet/install_location
// So we need to redirect it to a different place here.
- string directory = Path.Combine(TestArtifact.TestArtifactsPath, "installLocationOverride");
+ string directory = Path.Combine(TestArtifact.TestArtifactsPath, "installLocationOverride" + Process.GetCurrentProcess().Id.ToString());
+ if (Directory.Exists(directory))
+ Directory.Delete(directory, true);
Directory.CreateDirectory(directory);
- PathValueOverride = Path.Combine(directory, "install_location." + Process.GetCurrentProcess().Id.ToString());
- File.WriteAllText(PathValueOverride, "");
+ PathValueOverride = directory;
}
}
@@ -78,9 +79,12 @@ public void SetInstallLocation(params (string Architecture, string Path)[] locat
}
else
{
- File.WriteAllText(PathValueOverride, string.Join(Environment.NewLine,
- locations.Select(l => string.Format("{0}{1}",
- (!string.IsNullOrWhiteSpace(l.Architecture) ? l.Architecture + "=" : ""), l.Path))));
+ foreach (var location in locations)
+ {
+ string installLocationFileName = "install_location" +
+ (!string.IsNullOrWhiteSpace(location.Architecture) ? ("_" + location.Architecture) : string.Empty);
+ File.WriteAllText(Path.Combine(PathValueOverride, installLocationFileName), location.Path);
+ }
}
}
@@ -127,7 +131,7 @@ public static Command ApplyRegisteredInstallLocationOverride(
else
{
return command.EnvironmentVariable(
- Constants.TestOnlyEnvironmentVariables.InstallLocationFilePath,
+ Constants.TestOnlyEnvironmentVariables.InstallLocationPath,
registeredInstallLocationOverride.PathValueOverride);
}
}
diff --git a/src/installer/tests/HostActivation.Tests/StartupHooks.cs b/src/installer/tests/HostActivation.Tests/StartupHooks.cs
index a0533a60fd4772..3e1685356167f9 100644
--- a/src/installer/tests/HostActivation.Tests/StartupHooks.cs
+++ b/src/installer/tests/HostActivation.Tests/StartupHooks.cs
@@ -13,6 +13,7 @@ public class StartupHooks : IClassFixture
{
private SharedTestState sharedTestState;
private string startupHookVarName = "DOTNET_STARTUP_HOOKS";
+ private string startupHookRuntimeConfigName = "STARTUP_HOOKS";
private string startupHookSupport = "System.StartupHookProvider.IsSupported";
public StartupHooks(StartupHooks.SharedTestState fixture)
@@ -105,6 +106,64 @@ public void Muxer_activation_of_Multiple_StartupHooks_Succeeds()
.And.HaveStdOutContaining("Hello World");
}
+ [Fact]
+ public void Muxer_activation_of_RuntimeConfig_StartupHook_Succeeds()
+ {
+ var fixture = sharedTestState.PortableAppFixture.Copy();
+ var dotnet = fixture.BuiltDotnet;
+ var appDll = fixture.TestProject.AppDll;
+
+ var startupHookFixture = sharedTestState.StartupHookFixture.Copy();
+ var startupHookDll = startupHookFixture.TestProject.AppDll;
+
+ RuntimeConfig.FromFile(fixture.TestProject.RuntimeConfigJson)
+ .WithProperty(startupHookRuntimeConfigName, startupHookDll)
+ .Save();
+
+ // RuntimeConfig defined startup hook
+ dotnet.Exec(appDll)
+ .CaptureStdOut()
+ .CaptureStdErr()
+ .Execute()
+ .Should().Pass()
+ .And.HaveStdOutContaining("Hello from startup hook!")
+ .And.HaveStdOutContaining("Hello World");
+ }
+
+ [Fact]
+ public void Muxer_activation_of_RuntimeConfig_And_Environment_StartupHooks_SucceedsInExpectedOrder()
+ {
+ var fixture = sharedTestState.PortableAppFixture.Copy();
+ var dotnet = fixture.BuiltDotnet;
+ var appDll = fixture.TestProject.AppDll;
+
+ var startupHookFixture = sharedTestState.StartupHookFixture.Copy();
+ var startupHookDll = startupHookFixture.TestProject.AppDll;
+
+ RuntimeConfig.FromFile(fixture.TestProject.RuntimeConfigJson)
+ .WithProperty(startupHookRuntimeConfigName, startupHookDll)
+ .Save();
+
+ var startupHook2Fixture = sharedTestState.StartupHookWithDependencyFixture.Copy();
+ var startupHook2Dll = startupHook2Fixture.TestProject.AppDll;
+
+ // include any char to counter output from other threads such as in #57243
+ const string wildcardPattern = @"[\r\n\s.]*";
+
+ // RuntimeConfig and Environment startup hooks in expected order
+ dotnet.Exec(appDll)
+ .EnvironmentVariable(startupHookVarName, startupHook2Dll)
+ .CaptureStdOut()
+ .CaptureStdErr()
+ .Execute()
+ .Should().Pass()
+ .And.HaveStdOutMatching("Hello from startup hook with dependency!" +
+ wildcardPattern +
+ "Hello from startup hook!" +
+ wildcardPattern +
+ "Hello World");
+ }
+
// Empty startup hook variable
[Fact]
public void Muxer_activation_of_Empty_StartupHook_Variable_Succeeds()
diff --git a/src/installer/tests/Microsoft.DotNet.CoreSetup.Packaging.Tests/Microsoft.DotNet.CoreSetup.Packaging.Tests.csproj b/src/installer/tests/Microsoft.DotNet.CoreSetup.Packaging.Tests/Microsoft.DotNet.CoreSetup.Packaging.Tests.csproj
index 8dcef20c22dea9..73a3fda2b55fd4 100644
--- a/src/installer/tests/Microsoft.DotNet.CoreSetup.Packaging.Tests/Microsoft.DotNet.CoreSetup.Packaging.Tests.csproj
+++ b/src/installer/tests/Microsoft.DotNet.CoreSetup.Packaging.Tests/Microsoft.DotNet.CoreSetup.Packaging.Tests.csproj
@@ -7,7 +7,7 @@
-
+
diff --git a/src/installer/tests/Microsoft.DotNet.CoreSetup.Packaging.Tests/NETCoreTests.cs b/src/installer/tests/Microsoft.DotNet.CoreSetup.Packaging.Tests/NETCoreTests.cs
index 65d19d7983c413..cda507f61480de 100644
--- a/src/installer/tests/Microsoft.DotNet.CoreSetup.Packaging.Tests/NETCoreTests.cs
+++ b/src/installer/tests/Microsoft.DotNet.CoreSetup.Packaging.Tests/NETCoreTests.cs
@@ -18,7 +18,7 @@ public void NETCoreTargetingPackIsValid()
"Microsoft.NETCore.App.Ref"))
{
// Allow no targeting pack in case this is a servicing build.
- // This condition should be tightened: https://github.com/dotnet/core-setup/issues/8830
+ // This condition should be tightened: https://github.com/dotnet/runtime/issues/3836
if (tester == null)
{
return;
diff --git a/src/installer/tests/Microsoft.DotNet.CoreSetup.Packaging.Tests/NuGetArtifactTester.cs b/src/installer/tests/Microsoft.DotNet.CoreSetup.Packaging.Tests/NuGetArtifactTester.cs
index 4af9206f6b3513..292e3522d961e1 100644
--- a/src/installer/tests/Microsoft.DotNet.CoreSetup.Packaging.Tests/NuGetArtifactTester.cs
+++ b/src/installer/tests/Microsoft.DotNet.CoreSetup.Packaging.Tests/NuGetArtifactTester.cs
@@ -41,10 +41,7 @@ public static NuGetArtifactTester OpenOrNull(
"Shipping",
$"{id}.{dirs.MicrosoftNETCoreAppVersion}.nupkg");
- // If the nuspec exists, the nupkg should exist.
- Assert.True(File.Exists(nupkgPath));
-
- return new NuGetArtifactTester(nupkgPath);
+ return File.Exists(nupkgPath) ? new NuGetArtifactTester(nupkgPath) : null;
}
public PackageIdentity Identity { get; }
diff --git a/src/installer/tests/Microsoft.NET.HostModel.Tests/AppHost.Bundle.Tests/BundleTestBase.cs b/src/installer/tests/Microsoft.NET.HostModel.Tests/AppHost.Bundle.Tests/BundleTestBase.cs
index 18aba06f6d9786..669b300cb838ad 100644
--- a/src/installer/tests/Microsoft.NET.HostModel.Tests/AppHost.Bundle.Tests/BundleTestBase.cs
+++ b/src/installer/tests/Microsoft.NET.HostModel.Tests/AppHost.Bundle.Tests/BundleTestBase.cs
@@ -25,7 +25,7 @@ public static string UseSingleFileSelfContainedHost(TestProjectFixture testFixtu
var publishedHostPath = BundleHelper.GetHostPath(testFixture);
HostWriter.CreateAppHost(singleFileHost,
publishedHostPath,
- BundleHelper.GetAppPath(testFixture));
+ BundleHelper.GetAppName(testFixture));
return publishedHostPath;
}
@@ -37,7 +37,7 @@ public static string UseFrameworkDependentHost(TestProjectFixture testFixture)
var publishedHostPath = BundleHelper.GetHostPath(testFixture);
HostWriter.CreateAppHost(appHost,
publishedHostPath,
- BundleHelper.GetAppPath(testFixture));
+ BundleHelper.GetAppName(testFixture));
return publishedHostPath;
}
diff --git a/src/installer/tests/Microsoft.NET.HostModel.Tests/AppHost.Bundle.Tests/BundledAppWithSubDirs.cs b/src/installer/tests/Microsoft.NET.HostModel.Tests/AppHost.Bundle.Tests/BundledAppWithSubDirs.cs
index 66212592138151..9442777b7a5fdc 100644
--- a/src/installer/tests/Microsoft.NET.HostModel.Tests/AppHost.Bundle.Tests/BundledAppWithSubDirs.cs
+++ b/src/installer/tests/Microsoft.NET.HostModel.Tests/AppHost.Bundle.Tests/BundledAppWithSubDirs.cs
@@ -2,6 +2,7 @@
// The .NET Foundation licenses this file to you under the MIT license.
using System;
+using System.IO;
using BundleTests.Helpers;
using Microsoft.DotNet.Cli.Build.Framework;
using Microsoft.DotNet.CoreSetup.Test;
@@ -22,9 +23,7 @@ public BundledAppWithSubDirs(SharedTestState fixture)
private void RunTheApp(string path, TestProjectFixture fixture)
{
Command.Create(path)
- .EnvironmentVariable("COREHOST_TRACE", "1")
- .CaptureStdErr()
- .CaptureStdOut()
+ .EnableTracingAndCaptureOutputs()
.EnvironmentVariable("DOTNET_ROOT", fixture.BuiltDotnet.BinPath)
.EnvironmentVariable("DOTNET_ROOT(x86)", fixture.BuiltDotnet.BinPath)
.EnvironmentVariable("DOTNET_MULTILEVEL_LOOKUP", "0")
@@ -52,6 +51,47 @@ public void Bundled_Framework_dependent_App_Run_Succeeds(BundleOptions options)
RunTheApp(singleFile, fixture);
}
+ [InlineData(BundleOptions.None)]
+ [InlineData(BundleOptions.BundleNativeBinaries)]
+ [InlineData(BundleOptions.BundleAllContent)]
+ [Theory]
+ [PlatformSpecific(TestPlatforms.Windows)] // GUI app host is only supported on Windows.
+ public void Bundled_Framework_dependent_App_GUI_DownlevelHostFxr_ErrorDialog(BundleOptions options)
+ {
+ var fixture = sharedTestState.TestFrameworkDependentFixture.Copy();
+ UseFrameworkDependentHost(fixture);
+ var singleFile = BundleHelper.BundleApp(fixture, options);
+ AppHostExtensions.SetWindowsGraphicalUserInterfaceBit(singleFile);
+
+ string dotnetWithMockHostFxr = SharedFramework.CalculateUniqueTestDirectory(Path.Combine(TestArtifact.TestArtifactsPath, "bundleErrors"));
+ using (new TestArtifact(dotnetWithMockHostFxr))
+ {
+ Directory.CreateDirectory(dotnetWithMockHostFxr);
+ string expectedErrorCode = Constants.ErrorCode.BundleExtractionFailure.ToString("x");
+
+ var dotnetBuilder = new DotNetBuilder(dotnetWithMockHostFxr, sharedTestState.RepoDirectories.BuiltDotnet, "mockhostfxrBundleVersionFailure")
+ .RemoveHostFxr()
+ .AddMockHostFxr(new Version(5, 0, 0));
+ var dotnet = dotnetBuilder.Build();
+
+ Command command = Command.Create(singleFile)
+ .EnableTracingAndCaptureOutputs()
+ .DotNetRoot(dotnet.BinPath, sharedTestState.RepoDirectories.BuildArchitecture)
+ .MultilevelLookup(false)
+ .Start();
+
+ WindowsUtils.WaitForPopupFromProcess(command.Process);
+ command.Process.Kill();
+
+ command
+ .WaitForExit(true)
+ .Should().Fail()
+ .And.HaveStdErrContaining("Bundle header version compatibility check failed.")
+ .And.HaveStdErrContaining($"Showing error dialog for application: '{Path.GetFileName(singleFile)}' - error code: 0x{expectedErrorCode}")
+ .And.HaveStdErrContaining("apphost_version=");
+ }
+ }
+
[InlineData(BundleOptions.None)]
[InlineData(BundleOptions.BundleNativeBinaries)]
[InlineData(BundleOptions.BundleAllContent)]
diff --git a/src/installer/tests/TestUtils/Command.cs b/src/installer/tests/TestUtils/Command.cs
index 3c3e5607dde90a..91f85be3584324 100644
--- a/src/installer/tests/TestUtils/Command.cs
+++ b/src/installer/tests/TestUtils/Command.cs
@@ -3,6 +3,7 @@
using System;
using System.Collections.Generic;
+using System.ComponentModel;
using System.Diagnostics;
using System.IO;
using System.Linq;
@@ -120,7 +121,7 @@ private static bool ShouldUseCmd(string executable)
}
else
{
- // Search the path to see if we can find it
+ // Search the path to see if we can find it
foreach (var path in System.Environment.GetEnvironmentVariable("PATH").Split(Path.PathSeparator))
{
var candidate = Path.Combine(path, executable + ".exe");
@@ -196,7 +197,20 @@ public Command Start()
ReportExecBegin();
- Process.Start();
+ // Retry if we hit ETXTBSY due to Linux race
+ // https://github.com/dotnet/runtime/issues/58964
+ for (int i = 0; ; i++)
+ {
+ try
+ {
+ Process.Start();
+ break;
+ }
+ catch (Win32Exception e) when (i < 4 && e.Message.Contains("Text file busy"))
+ {
+ Thread.Sleep(i * 20);
+ }
+ }
if (Process.StartInfo.RedirectStandardOutput)
{
diff --git a/src/installer/tests/HostActivation.Tests/CommandExtensions.cs b/src/installer/tests/TestUtils/CommandExtensions.cs
similarity index 81%
rename from src/installer/tests/HostActivation.Tests/CommandExtensions.cs
rename to src/installer/tests/TestUtils/CommandExtensions.cs
index d8460c1368bdb5..38c4cbff3ba448 100644
--- a/src/installer/tests/HostActivation.Tests/CommandExtensions.cs
+++ b/src/installer/tests/TestUtils/CommandExtensions.cs
@@ -2,10 +2,11 @@
// The .NET Foundation licenses this file to you under the MIT license.
using Microsoft.DotNet.Cli.Build.Framework;
+using Microsoft.DotNet.CoreSetup.Test;
using System;
using System.IO;
-namespace Microsoft.DotNet.CoreSetup.Test.HostActivation
+namespace Microsoft.DotNet.CoreSetup.Test
{
public static class CommandExtensions
{
@@ -38,11 +39,11 @@ public static Command EnableTracingAndCaptureOutputs(this Command command)
public static Command DotNetRoot(this Command command, string dotNetRoot, string architecture = null)
{
if (!string.IsNullOrEmpty(architecture))
- return command.EnvironmentVariable($"DOTNET_ROOT_{architecture.ToUpper()}", dotNetRoot);
+ return command.EnvironmentVariable(Constants.DotnetRoot.ArchitectureEnvironmentVariablePrefix + architecture.ToUpper(), dotNetRoot);
return command
- .EnvironmentVariable("DOTNET_ROOT", dotNetRoot)
- .EnvironmentVariable("DOTNET_ROOT(x86)", dotNetRoot);
+ .EnvironmentVariable(Constants.DotnetRoot.EnvironmentVariable, dotNetRoot)
+ .EnvironmentVariable(Constants.DotnetRoot.WindowsX86EnvironmentVariable, dotNetRoot);
}
public static Command MultilevelLookup(this Command command, bool enable)
diff --git a/src/installer/tests/HostActivation.Tests/Constants.cs b/src/installer/tests/TestUtils/Constants.cs
similarity index 86%
rename from src/installer/tests/HostActivation.Tests/Constants.cs
rename to src/installer/tests/TestUtils/Constants.cs
index f7e743aa99aa38..e36df4bd2cdb39 100644
--- a/src/installer/tests/HostActivation.Tests/Constants.cs
+++ b/src/installer/tests/TestUtils/Constants.cs
@@ -1,9 +1,9 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
-namespace Microsoft.DotNet.CoreSetup.Test.HostActivation
+namespace Microsoft.DotNet.CoreSetup.Test
{
- internal static class Constants
+ public static class Constants
{
public const string MicrosoftNETCoreApp = "Microsoft.NETCore.App";
@@ -53,7 +53,7 @@ public static class TestOnlyEnvironmentVariables
public const string DefaultInstallPath = "_DOTNET_TEST_DEFAULT_INSTALL_PATH";
public const string RegistryPath = "_DOTNET_TEST_REGISTRY_PATH";
public const string GloballyRegisteredPath = "_DOTNET_TEST_GLOBALLY_REGISTERED_PATH";
- public const string InstallLocationFilePath = "_DOTNET_TEST_INSTALL_LOCATION_FILE_PATH";
+ public const string InstallLocationPath = "_DOTNET_TEST_INSTALL_LOCATION_PATH";
}
public static class RuntimeId
@@ -72,6 +72,13 @@ public static class HostTracing
public const string TraceFileEnvironmentVariable = "COREHOST_TRACEFILE";
}
+ public static class DotnetRoot
+ {
+ public const string EnvironmentVariable = "DOTNET_ROOT";
+ public const string WindowsX86EnvironmentVariable = "DOTNET_ROOT(x86)";
+ public const string ArchitectureEnvironmentVariablePrefix = "DOTNET_ROOT_";
+ }
+
public static class ErrorCode
{
public const int InvalidArgFailure = unchecked((int)0x80008081);
@@ -81,6 +88,7 @@ public static class ErrorCode
public const int LibHostInvalidArgs = unchecked((int)0x80008092);
public const int AppArgNotRunnable = unchecked((int)0x80008094);
public const int FrameworkMissingFailure = unchecked((int)0x80008096);
+ public const int BundleExtractionFailure = unchecked((int)0x8000809f);
public const int COMPlusException = unchecked((int)0xe0434352);
public const int SIGABRT = 134;
diff --git a/src/installer/tests/HostActivation.Tests/DotNetBuilder.cs b/src/installer/tests/TestUtils/DotNetBuilder.cs
similarity index 95%
rename from src/installer/tests/HostActivation.Tests/DotNetBuilder.cs
rename to src/installer/tests/TestUtils/DotNetBuilder.cs
index 0a8d54559e2275..d4cb58340ca6ed 100644
--- a/src/installer/tests/HostActivation.Tests/DotNetBuilder.cs
+++ b/src/installer/tests/TestUtils/DotNetBuilder.cs
@@ -5,7 +5,7 @@
using System;
using System.IO;
-namespace Microsoft.DotNet.CoreSetup.Test.HostActivation
+namespace Microsoft.DotNet.CoreSetup.Test
{
///
/// Helper class for creating a mock version of a dotnet installation
@@ -68,16 +68,19 @@ public DotNetBuilder AddMicrosoftNETCoreAppFrameworkMockHostPolicy(string versio
/// Use a mock version of HostFxr.
///
/// Version to add
- ///
- /// Currently, the only mock version of HostFxr that we have is mockhostfxr_2_2.
- ///
public DotNetBuilder AddMockHostFxr(Version version)
{
string hostfxrPath = Path.Combine(_path, "host", "fxr", version.ToString());
Directory.CreateDirectory(hostfxrPath);
- bool hasCustomErrorWriter = version.Major >= 3;
- string mockHostFxrFileName = RuntimeInformationExtensions.GetSharedLibraryFileNameForCurrentPlatform(hasCustomErrorWriter ? "mockhostfxr" : "mockhostfxr_2_2");
+ string mockHostFxrFileNameBase = version switch
+ {
+ { Major: 2, Minor: 2 } => "mockhostfxr_2_2",
+ { Major: 5, Minor: 0 } => "mockhostfxr_5_0",
+ _ => throw new InvalidOperationException($"Unsupported version {version} of mockhostfxr.")
+ };
+
+ string mockHostFxrFileName = RuntimeInformationExtensions.GetSharedLibraryFileNameForCurrentPlatform(mockHostFxrFileNameBase);
File.Copy(
Path.Combine(_repoDirectories.Artifacts, "corehost_test", mockHostFxrFileName),
Path.Combine(hostfxrPath, RuntimeInformationExtensions.GetSharedLibraryFileNameForCurrentPlatform("hostfxr")),
diff --git a/src/installer/tests/TestUtils/FileUtils.cs b/src/installer/tests/TestUtils/FileUtils.cs
index 8da68f684734bf..a66ead73e0b026 100644
--- a/src/installer/tests/TestUtils/FileUtils.cs
+++ b/src/installer/tests/TestUtils/FileUtils.cs
@@ -5,7 +5,7 @@
using System.IO;
using System.IO.MemoryMappedFiles;
-namespace Microsoft.DotNet.CoreSetup.Test.HostActivation
+namespace Microsoft.DotNet.CoreSetup.Test
{
public static class FileUtils
{
diff --git a/src/installer/tests/HostActivation.Tests/NetCoreAppBuilder.cs b/src/installer/tests/TestUtils/NetCoreAppBuilder.cs
similarity index 99%
rename from src/installer/tests/HostActivation.Tests/NetCoreAppBuilder.cs
rename to src/installer/tests/TestUtils/NetCoreAppBuilder.cs
index ba5e101558c29d..f4909cde996799 100644
--- a/src/installer/tests/HostActivation.Tests/NetCoreAppBuilder.cs
+++ b/src/installer/tests/TestUtils/NetCoreAppBuilder.cs
@@ -7,7 +7,7 @@
using System.IO;
using System.Linq;
-namespace Microsoft.DotNet.CoreSetup.Test.HostActivation
+namespace Microsoft.DotNet.CoreSetup.Test
{
public class NetCoreAppBuilder
{
diff --git a/src/installer/tests/HostActivation.Tests/RuntimeConfig.cs b/src/installer/tests/TestUtils/RuntimeConfig.cs
similarity index 99%
rename from src/installer/tests/HostActivation.Tests/RuntimeConfig.cs
rename to src/installer/tests/TestUtils/RuntimeConfig.cs
index eaa95cb2dcced0..2a8418f4713280 100644
--- a/src/installer/tests/HostActivation.Tests/RuntimeConfig.cs
+++ b/src/installer/tests/TestUtils/RuntimeConfig.cs
@@ -8,7 +8,7 @@
using System.IO;
using System.Linq;
-namespace Microsoft.DotNet.CoreSetup.Test.HostActivation
+namespace Microsoft.DotNet.CoreSetup.Test
{
public class RuntimeConfig
{
diff --git a/src/installer/tests/HostActivation.Tests/SharedFramework.cs b/src/installer/tests/TestUtils/SharedFramework.cs
similarity index 99%
rename from src/installer/tests/HostActivation.Tests/SharedFramework.cs
rename to src/installer/tests/TestUtils/SharedFramework.cs
index a887b2bf65160a..408cf58f37b4e1 100644
--- a/src/installer/tests/HostActivation.Tests/SharedFramework.cs
+++ b/src/installer/tests/TestUtils/SharedFramework.cs
@@ -10,7 +10,7 @@ namespace Microsoft.DotNet.CoreSetup.Test
///
/// Helper class for creating, modifying and cleaning up shared frameworks
///
- internal static class SharedFramework
+ public static class SharedFramework
{
private static readonly Mutex id_mutex = new Mutex();
diff --git a/src/installer/tests/TestUtils/TestArtifact.cs b/src/installer/tests/TestUtils/TestArtifact.cs
index 8483e4c88f7a8a..e1ca67416377ee 100644
--- a/src/installer/tests/TestUtils/TestArtifact.cs
+++ b/src/installer/tests/TestUtils/TestArtifact.cs
@@ -3,7 +3,6 @@
#nullable enable
-using Microsoft.DotNet.CoreSetup.Test.HostActivation;
using System;
using System.Collections.Generic;
using System.Diagnostics;
diff --git a/src/installer/tests/TestUtils/TestUtils.csproj b/src/installer/tests/TestUtils/TestUtils.csproj
index 35cb3e19e9d77a..1ca28978738f78 100644
--- a/src/installer/tests/TestUtils/TestUtils.csproj
+++ b/src/installer/tests/TestUtils/TestUtils.csproj
@@ -15,6 +15,8 @@
+
+
diff --git a/src/installer/tests/TestUtils/WindowsUtils.cs b/src/installer/tests/TestUtils/WindowsUtils.cs
new file mode 100644
index 00000000000000..aff4c1fef8297b
--- /dev/null
+++ b/src/installer/tests/TestUtils/WindowsUtils.cs
@@ -0,0 +1,54 @@
+// 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.Diagnostics;
+using System.Runtime.InteropServices;
+
+namespace Microsoft.DotNet.CoreSetup.Test
+{
+ public static class WindowsUtils
+ {
+ private delegate bool EnumThreadWindowsDelegate(IntPtr hWnd, IntPtr lParam);
+
+ [DllImport("user32.dll")]
+ private static extern bool EnumThreadWindows(int dwThreadId, EnumThreadWindowsDelegate plfn, IntPtr lParam);
+
+ public static IntPtr WaitForPopupFromProcess(Process process, int timeout = 60000)
+ {
+ if (!OperatingSystem.IsWindows())
+ {
+ throw new PlatformNotSupportedException();
+ }
+
+ IntPtr windowHandle = IntPtr.Zero;
+ int timeRemaining = timeout;
+ while (timeRemaining > 0)
+ {
+ foreach (ProcessThread thread in process.Threads)
+ {
+ // We take the last window we find. There really should only be one at most anyways.
+ EnumThreadWindows(thread.Id,
+ (hWnd, lParam) => {
+ windowHandle = hWnd;
+ return true;
+ },
+ IntPtr.Zero);
+ }
+
+ if (windowHandle != IntPtr.Zero)
+ {
+ break;
+ }
+
+ System.Threading.Thread.Sleep(100);
+ timeRemaining -= 100;
+ }
+
+ // Do not fail if the window could be detected, sometimes the check is fragile and doesn't work.
+ // Not worth the trouble trying to figure out why (only happens rarely in the CI system).
+ // We will rely on product tracing in the failure case.
+ return windowHandle;
+ }
+ }
+}
diff --git a/src/libraries/Common/src/Internal/Cryptography/HashProviderCng.cs b/src/libraries/Common/src/Internal/Cryptography/HashProviderCng.cs
index 3b864790b25252..c905ca1bd6996e 100644
--- a/src/libraries/Common/src/Internal/Cryptography/HashProviderCng.cs
+++ b/src/libraries/Common/src/Internal/Cryptography/HashProviderCng.cs
@@ -127,10 +127,15 @@ public override void Reset()
{
if (_reusable && !_running)
return;
+
DestroyHash();
+ BCryptCreateHashFlags flags = _reusable ?
+ BCryptCreateHashFlags.BCRYPT_HASH_REUSABLE_FLAG :
+ BCryptCreateHashFlags.None;
+
SafeBCryptHashHandle hHash;
- NTSTATUS ntStatus = Interop.BCrypt.BCryptCreateHash(_hAlgorithm, out hHash, IntPtr.Zero, 0, _key, _key == null ? 0 : _key.Length, BCryptCreateHashFlags.None);
+ NTSTATUS ntStatus = Interop.BCrypt.BCryptCreateHash(_hAlgorithm, out hHash, IntPtr.Zero, 0, _key, _key == null ? 0 : _key.Length, flags);
if (ntStatus != NTSTATUS.STATUS_SUCCESS)
throw Interop.BCrypt.CreateCryptographicException(ntStatus);
diff --git a/src/libraries/Common/src/Interop/Linux/OpenLdap/Interop.Ldap.cs b/src/libraries/Common/src/Interop/Linux/OpenLdap/Interop.Ldap.cs
index f38bb375b347e5..7fbaf9cc32eab8 100644
--- a/src/libraries/Common/src/Interop/Linux/OpenLdap/Interop.Ldap.cs
+++ b/src/libraries/Common/src/Interop/Linux/OpenLdap/Interop.Ldap.cs
@@ -136,8 +136,9 @@ static Ldap()
[DllImport(Libraries.OpenLdap, EntryPoint = "ldap_set_option", CharSet = CharSet.Ansi)]
public static extern int ldap_set_option_referral([In] ConnectionHandle ldapHandle, [In] LdapOption option, ref LdapReferralCallback outValue);
+ // Note that ldap_start_tls_s has a different signature across Windows LDAP and OpenLDAP
[DllImport(Libraries.OpenLdap, EntryPoint = "ldap_start_tls_s", CharSet = CharSet.Ansi)]
- public static extern int ldap_start_tls(ConnectionHandle ldapHandle, ref int ServerReturnValue, ref IntPtr Message, IntPtr ServerControls, IntPtr ClientControls);
+ public static extern int ldap_start_tls(ConnectionHandle ldapHandle, IntPtr serverControls, IntPtr clientControls);
[DllImport(Libraries.OpenLdap, EntryPoint = "ldap_parse_result", CharSet = CharSet.Ansi)]
public static extern int ldap_parse_result([In] ConnectionHandle ldapHandle, [In] IntPtr result, ref int serverError, ref IntPtr dn, ref IntPtr message, ref IntPtr referral, ref IntPtr control, byte freeIt);
diff --git a/src/libraries/Common/src/Interop/OSX/Interop.libproc.cs b/src/libraries/Common/src/Interop/OSX/Interop.libproc.cs
index fd4b968c132ea8..af75653dd2f3c4 100644
--- a/src/libraries/Common/src/Interop/OSX/Interop.libproc.cs
+++ b/src/libraries/Common/src/Interop/OSX/Interop.libproc.cs
@@ -25,6 +25,9 @@ internal static partial class libproc
// Constants from sys\resource.h
private const int RUSAGE_INFO_V3 = 3;
+ // Constants from sys/errno.h
+ private const int EPERM = 1;
+
// Defines from proc_info.h
internal enum ThreadRunState
{
@@ -120,7 +123,14 @@ internal static unsafe int[] proc_listallpids()
{
// Get the number of processes currently running to know how much data to allocate
int numProcesses = proc_listallpids(null, 0);
- if (numProcesses <= 0)
+ if (numProcesses == 0 && Marshal.GetLastPInvokeError() == EPERM)
+ {
+ // An app running in App Sandbox does not have permissions to list other running processes
+ // and so the `proc_listallpids` function returns 0 and sets errno to 1. As a fallback
+ // we return at least an array with the PID of the current process which we always know.
+ return new[] { Environment.ProcessId };
+ }
+ else if (numProcesses <= 0)
{
throw new Win32Exception(SR.CantGetAllPids);
}
diff --git a/src/libraries/Common/src/Interop/OSX/System.Native/Interop.SearchPath.iOS.cs b/src/libraries/Common/src/Interop/OSX/System.Native/Interop.SearchPath.iOS.cs
new file mode 100644
index 00000000000000..8d73184ca4d50a
--- /dev/null
+++ b/src/libraries/Common/src/Interop/OSX/System.Native/Interop.SearchPath.iOS.cs
@@ -0,0 +1,14 @@
+// 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.Runtime.InteropServices;
+
+internal static partial class Interop
+{
+ internal static partial class Sys
+ {
+ [DllImport(Libraries.SystemNative, EntryPoint = "SystemNative_SearchPath_TempDirectory")]
+ internal static extern string SearchPathTempDirectory();
+ }
+}
diff --git a/src/libraries/Common/src/Interop/Unix/System.Native/Interop.PosixFAllocate.cs b/src/libraries/Common/src/Interop/Unix/System.Native/Interop.FAllocate.cs
similarity index 63%
rename from src/libraries/Common/src/Interop/Unix/System.Native/Interop.PosixFAllocate.cs
rename to src/libraries/Common/src/Interop/Unix/System.Native/Interop.FAllocate.cs
index 2866ed38935bdf..71155e0f35e67e 100644
--- a/src/libraries/Common/src/Interop/Unix/System.Native/Interop.PosixFAllocate.cs
+++ b/src/libraries/Common/src/Interop/Unix/System.Native/Interop.FAllocate.cs
@@ -9,9 +9,9 @@ internal static partial class Interop
internal static partial class Sys
{
///
- /// Returns -1 on ENOSPC, -2 on EFBIG. On success or ignorable error, 0 is returned.
+ /// Returns -1 on error, 0 on success.
///
- [DllImport(Libraries.SystemNative, EntryPoint = "SystemNative_PosixFAllocate", SetLastError = false)]
- internal static extern int PosixFAllocate(SafeFileHandle fd, long offset, long length);
+ [DllImport(Libraries.SystemNative, EntryPoint = "SystemNative_FAllocate", SetLastError = true)]
+ internal static extern int FAllocate(SafeFileHandle fd, long offset, long length);
}
}
diff --git a/src/libraries/Common/src/Interop/Unix/System.Native/Interop.GetEnv.cs b/src/libraries/Common/src/Interop/Unix/System.Native/Interop.GetEnv.cs
new file mode 100644
index 00000000000000..d83d6700b51622
--- /dev/null
+++ b/src/libraries/Common/src/Interop/Unix/System.Native/Interop.GetEnv.cs
@@ -0,0 +1,14 @@
+// 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.Runtime.InteropServices;
+
+internal static partial class Interop
+{
+ internal unsafe partial class Sys
+ {
+ [DllImport(Interop.Libraries.SystemNative, EntryPoint = "SystemNative_GetEnv")]
+ internal static extern unsafe IntPtr GetEnv(string name);
+ }
+}
\ No newline at end of file
diff --git a/src/libraries/Common/src/Interop/Unix/System.Native/Interop.GetEnviron.cs b/src/libraries/Common/src/Interop/Unix/System.Native/Interop.GetEnviron.cs
new file mode 100644
index 00000000000000..abe8ff0e1916ec
--- /dev/null
+++ b/src/libraries/Common/src/Interop/Unix/System.Native/Interop.GetEnviron.cs
@@ -0,0 +1,17 @@
+// 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.Runtime.InteropServices;
+
+internal static partial class Interop
+{
+ internal unsafe partial class Sys
+ {
+ [DllImport(Interop.Libraries.SystemNative, EntryPoint = "SystemNative_GetEnviron")]
+ internal static extern unsafe IntPtr GetEnviron();
+
+ [DllImport(Interop.Libraries.SystemNative, EntryPoint = "SystemNative_FreeEnviron")]
+ internal static extern unsafe void FreeEnviron(IntPtr environ);
+ }
+}
\ No newline at end of file
diff --git a/src/libraries/Common/src/Interop/Unix/System.Native/Interop.MountPoints.FormatInfo.cs b/src/libraries/Common/src/Interop/Unix/System.Native/Interop.MountPoints.FormatInfo.cs
index 15d6aa3c2f147a..fbd95d485e8415 100644
--- a/src/libraries/Common/src/Interop/Unix/System.Native/Interop.MountPoints.FormatInfo.cs
+++ b/src/libraries/Common/src/Interop/Unix/System.Native/Interop.MountPoints.FormatInfo.cs
@@ -80,6 +80,7 @@ private static DriveType GetDriveType(string fileSystemName)
// This list is based primarily on "man fs", "man mount", "mntent.h", "/proc/filesystems", coreutils "stat.c",
// and "wiki.debian.org/FileSystem". It can be extended over time as we find additional file systems that should
// be recognized as a particular drive type.
+ // Keep this in sync with the UnixFileSystemTypes enum in Interop.UnixFileSystemTypes.cs
switch (fileSystemName)
{
case "cddafs":
diff --git a/src/libraries/Common/src/Interop/Unix/System.Native/Interop.UnixFileSystemTypes.cs b/src/libraries/Common/src/Interop/Unix/System.Native/Interop.UnixFileSystemTypes.cs
index 892e5ccaaed336..d86dcfbe4e59ae 100644
--- a/src/libraries/Common/src/Interop/Unix/System.Native/Interop.UnixFileSystemTypes.cs
+++ b/src/libraries/Common/src/Interop/Unix/System.Native/Interop.UnixFileSystemTypes.cs
@@ -28,6 +28,7 @@ internal enum UnixFileSystemTypes : long
befs = 0x42465331,
bdevfs = 0x62646576,
bfs = 0x1BADFACE,
+ bpf_fs = 0xCAFE4A11,
binfmt_misc = 0x42494E4D,
bootfs = 0xA56D3FF9,
btrfs = 0x9123683E,
@@ -53,6 +54,7 @@ internal enum UnixFileSystemTypes : long
ext2 = 0xEF53,
ext3 = 0xEF53,
ext4 = 0xEF53,
+ f2fs = 0xF2F52010,
fat = 0x4006,
fd = 0xF00D1E,
fhgfs = 0x19830326,
@@ -122,6 +124,7 @@ internal enum UnixFileSystemTypes : long
sysv2 = 0x012FF7B6,
sysv4 = 0x012FF7B5,
tmpfs = 0x01021994,
+ tracefs = 0x74726163,
ubifs = 0x24051905,
udf = 0x15013346,
ufs = 0x00011954,
diff --git a/src/libraries/Common/src/Interop/Unix/System.Security.Cryptography.Native/Interop.EvpPkey.cs b/src/libraries/Common/src/Interop/Unix/System.Security.Cryptography.Native/Interop.EvpPkey.cs
index 924c2da14d4b59..4e82a6faf507e9 100644
--- a/src/libraries/Common/src/Interop/Unix/System.Security.Cryptography.Native/Interop.EvpPkey.cs
+++ b/src/libraries/Common/src/Interop/Unix/System.Security.Cryptography.Native/Interop.EvpPkey.cs
@@ -105,18 +105,28 @@ internal static unsafe SafeEvpPKeyHandle DecodePkcs8PrivateKey(
}
[DllImport(Libraries.CryptoNative)]
- private static extern int CryptoNative_GetPkcs8PrivateKeySize(IntPtr pkey);
+ private static extern int CryptoNative_GetPkcs8PrivateKeySize(IntPtr pkey, out int p8size);
private static int GetPkcs8PrivateKeySize(IntPtr pkey)
{
- int ret = CryptoNative_GetPkcs8PrivateKeySize(pkey);
+ const int Success = 1;
+ const int Error = -1;
+ const int MissingPrivateKey = -2;
- if (ret < 0)
+ int ret = CryptoNative_GetPkcs8PrivateKeySize(pkey, out int p8size);
+
+ switch (ret)
{
- throw CreateOpenSslCryptographicException();
+ case Success:
+ return p8size;
+ case Error:
+ throw CreateOpenSslCryptographicException();
+ case MissingPrivateKey:
+ throw new CryptographicException(SR.Cryptography_CSP_NoPrivateKey);
+ default:
+ Debug.Fail($"Unexpected return '{ret}' value from {nameof(CryptoNative_GetPkcs8PrivateKeySize)}.");
+ throw new CryptographicException();
}
-
- return ret;
}
[DllImport(Libraries.CryptoNative)]
diff --git a/src/libraries/Common/src/Interop/Unix/System.Security.Cryptography.Native/Interop.OpenSsl.cs b/src/libraries/Common/src/Interop/Unix/System.Security.Cryptography.Native/Interop.OpenSsl.cs
index 73a9d32bb45c84..ae608c372778c9 100644
--- a/src/libraries/Common/src/Interop/Unix/System.Security.Cryptography.Native/Interop.OpenSsl.cs
+++ b/src/libraries/Common/src/Interop/Unix/System.Security.Cryptography.Native/Interop.OpenSsl.cs
@@ -59,7 +59,7 @@ internal static SafeSslHandle AllocateSslContext(SslProtocols protocols, SafeX50
throw CreateSslException(SR.net_allocate_ssl_context_failed);
}
- if (!Interop.Ssl.Tls13Supported)
+ if (!Interop.Ssl.Capabilities.Tls13Supported)
{
if (protocols != SslProtocols.None &&
CipherSuitesPolicyPal.WantsTls13(protocols))
diff --git a/src/libraries/Common/src/Interop/Unix/System.Security.Cryptography.Native/Interop.Ssl.cs b/src/libraries/Common/src/Interop/Unix/System.Security.Cryptography.Native/Interop.Ssl.cs
index 29154b77da6325..64db5a15147a4c 100644
--- a/src/libraries/Common/src/Interop/Unix/System.Security.Cryptography.Native/Interop.Ssl.cs
+++ b/src/libraries/Common/src/Interop/Unix/System.Security.Cryptography.Native/Interop.Ssl.cs
@@ -141,9 +141,13 @@ internal static partial class Ssl
}
[DllImport(Libraries.CryptoNative, EntryPoint = "CryptoNative_Tls13Supported")]
- [return: MarshalAs(UnmanagedType.Bool)]
- private static extern bool Tls13SupportedImpl();
- internal static readonly bool Tls13Supported = Tls13SupportedImpl();
+ private static extern int Tls13SupportedImpl();
+
+ internal static class Capabilities
+ {
+ // needs separate type (separate static cctor) to be sure OpenSSL is initialized.
+ internal static readonly bool Tls13Supported = Tls13SupportedImpl() != 0;
+ }
internal static SafeSharedX509NameStackHandle SslGetClientCAList(SafeSslHandle ssl)
{
diff --git a/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.FileOperations.cs b/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.FileOperations.cs
index cc4896c1c52e48..c43b4fd19d21d2 100644
--- a/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.FileOperations.cs
+++ b/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.FileOperations.cs
@@ -23,7 +23,8 @@ internal static partial class FileOperations
internal const int FILE_FLAG_OVERLAPPED = 0x40000000;
internal const int FILE_LIST_DIRECTORY = 0x0001;
- }
+ internal const int FILE_WRITE_ATTRIBUTES = 0x100;
+ }
}
}
diff --git a/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.REPARSE_DATA_BUFFER.cs b/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.REPARSE_DATA_BUFFER.cs
index 3bcb9162d57bfc..123ac9235b9fdc 100644
--- a/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.REPARSE_DATA_BUFFER.cs
+++ b/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.REPARSE_DATA_BUFFER.cs
@@ -14,24 +14,29 @@ internal static partial class Kernel32
internal const uint SYMLINK_FLAG_RELATIVE = 1;
// https://msdn.microsoft.com/library/windows/hardware/ff552012.aspx
- // We don't need all the struct fields; omitting the rest.
[StructLayout(LayoutKind.Sequential)]
- internal unsafe struct REPARSE_DATA_BUFFER
+ internal unsafe struct SymbolicLinkReparseBuffer
{
internal uint ReparseTag;
internal ushort ReparseDataLength;
internal ushort Reserved;
- internal SymbolicLinkReparseBuffer ReparseBufferSymbolicLink;
+ internal ushort SubstituteNameOffset;
+ internal ushort SubstituteNameLength;
+ internal ushort PrintNameOffset;
+ internal ushort PrintNameLength;
+ internal uint Flags;
+ }
- [StructLayout(LayoutKind.Sequential)]
- internal struct SymbolicLinkReparseBuffer
- {
- internal ushort SubstituteNameOffset;
- internal ushort SubstituteNameLength;
- internal ushort PrintNameOffset;
- internal ushort PrintNameLength;
- internal uint Flags;
- }
+ [StructLayout(LayoutKind.Sequential)]
+ internal struct MountPointReparseBuffer
+ {
+ public uint ReparseTag;
+ public ushort ReparseDataLength;
+ public ushort Reserved;
+ public ushort SubstituteNameOffset;
+ public ushort SubstituteNameLength;
+ public ushort PrintNameOffset;
+ public ushort PrintNameLength;
}
}
}
diff --git a/src/libraries/Common/src/Interop/Windows/WinHttp/Interop.winhttp_types.cs b/src/libraries/Common/src/Interop/Windows/WinHttp/Interop.winhttp_types.cs
index 1b86a149072899..463de2572b2b3f 100644
--- a/src/libraries/Common/src/Interop/Windows/WinHttp/Interop.winhttp_types.cs
+++ b/src/libraries/Common/src/Interop/Windows/WinHttp/Interop.winhttp_types.cs
@@ -109,6 +109,7 @@ internal static partial class WinHttp
public const uint WINHTTP_FLAG_SECURE_PROTOCOL_TLS1 = 0x00000080;
public const uint WINHTTP_FLAG_SECURE_PROTOCOL_TLS1_1 = 0x00000200;
public const uint WINHTTP_FLAG_SECURE_PROTOCOL_TLS1_2 = 0x00000800;
+ public const uint WINHTTP_FLAG_SECURE_PROTOCOL_TLS1_3 = 0x00002000;
public const uint SECURITY_FLAG_IGNORE_UNKNOWN_CA = 0x00000100;
public const uint SECURITY_FLAG_IGNORE_CERT_DATE_INVALID = 0x00002000;
@@ -167,6 +168,7 @@ internal static partial class WinHttp
public const uint WINHTTP_OPTION_TCP_KEEPALIVE = 152;
public const uint WINHTTP_OPTION_STREAM_ERROR_CODE = 159;
+ public const uint WINHTTP_OPTION_REQUIRE_STREAM_END = 160;
public enum WINHTTP_WEB_SOCKET_BUFFER_TYPE
{
diff --git a/src/libraries/Common/src/Roslyn/GetBestTypeByMetadataName.cs b/src/libraries/Common/src/Roslyn/GetBestTypeByMetadataName.cs
new file mode 100644
index 00000000000000..c86d7f2e00ebc4
--- /dev/null
+++ b/src/libraries/Common/src/Roslyn/GetBestTypeByMetadataName.cs
@@ -0,0 +1,138 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using Microsoft.CodeAnalysis;
+
+namespace Microsoft.CodeAnalysis.DotnetRuntime.Extensions
+{
+ internal static class RoslynExtensions
+ {
+ // Copied from: https://github.com/dotnet/roslyn/blob/main/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Extensions/CompilationExtensions.cs
+ ///
+ /// Gets a type by its metadata name to use for code analysis within a . This method
+ /// attempts to find the "best" symbol to use for code analysis, which is the symbol matching the first of the
+ /// following rules.
+ ///
+ ///
+ /// -
+ /// If only one type with the given name is found within the compilation and its referenced assemblies, that
+ /// type is returned regardless of accessibility.
+ ///
+ /// -
+ /// If the current defines the symbol, that symbol is returned.
+ ///
+ /// -
+ /// If exactly one referenced assembly defines the symbol in a manner that makes it visible to the current
+ /// , that symbol is returned.
+ ///
+ /// -
+ /// Otherwise, this method returns .
+ ///
+ ///
+ ///
+ /// The to consider for analysis.
+ /// The fully-qualified metadata type name to find.
+ /// The symbol to use for code analysis; otherwise, .
+ public static INamedTypeSymbol? GetBestTypeByMetadataName(this Compilation compilation, string fullyQualifiedMetadataName)
+ {
+ // Try to get the unique type with this name, ignoring accessibility
+ var type = compilation.GetTypeByMetadataName(fullyQualifiedMetadataName);
+
+ // Otherwise, try to get the unique type with this name originally defined in 'compilation'
+ type ??= compilation.Assembly.GetTypeByMetadataName(fullyQualifiedMetadataName);
+
+ // Otherwise, try to get the unique accessible type with this name from a reference
+ if (type is null)
+ {
+ foreach (var module in compilation.Assembly.Modules)
+ {
+ foreach (var referencedAssembly in module.ReferencedAssemblySymbols)
+ {
+ var currentType = referencedAssembly.GetTypeByMetadataName(fullyQualifiedMetadataName);
+ if (currentType is null)
+ continue;
+
+ switch (currentType.GetResultantVisibility())
+ {
+ case SymbolVisibility.Public:
+ case SymbolVisibility.Internal when referencedAssembly.GivesAccessTo(compilation.Assembly):
+ break;
+
+ default:
+ continue;
+ }
+
+ if (type is object)
+ {
+ // Multiple visible types with the same metadata name are present
+ return null;
+ }
+
+ type = currentType;
+ }
+ }
+ }
+
+ return type;
+ }
+
+ // copied from https://github.com/dotnet/roslyn/blob/main/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Extensions/ISymbolExtensions.cs
+ private static SymbolVisibility GetResultantVisibility(this ISymbol symbol)
+ {
+ // Start by assuming it's visible.
+ SymbolVisibility visibility = SymbolVisibility.Public;
+
+ switch (symbol.Kind)
+ {
+ case SymbolKind.Alias:
+ // Aliases are uber private. They're only visible in the same file that they
+ // were declared in.
+ return SymbolVisibility.Private;
+
+ case SymbolKind.Parameter:
+ // Parameters are only as visible as their containing symbol
+ return GetResultantVisibility(symbol.ContainingSymbol);
+
+ case SymbolKind.TypeParameter:
+ // Type Parameters are private.
+ return SymbolVisibility.Private;
+ }
+
+ while (symbol != null && symbol.Kind != SymbolKind.Namespace)
+ {
+ switch (symbol.DeclaredAccessibility)
+ {
+ // If we see anything private, then the symbol is private.
+ case Accessibility.NotApplicable:
+ case Accessibility.Private:
+ return SymbolVisibility.Private;
+
+ // If we see anything internal, then knock it down from public to
+ // internal.
+ case Accessibility.Internal:
+ case Accessibility.ProtectedAndInternal:
+ visibility = SymbolVisibility.Internal;
+ break;
+
+ // For anything else (Public, Protected, ProtectedOrInternal), the
+ // symbol stays at the level we've gotten so far.
+ }
+
+ symbol = symbol.ContainingSymbol;
+ }
+
+ return visibility;
+ }
+
+ // Copied from: https://github.com/dotnet/roslyn/blob/main/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Utilities/SymbolVisibility.cs
+#pragma warning disable CA1027 // Mark enums with FlagsAttribute
+ private enum SymbolVisibility
+#pragma warning restore CA1027 // Mark enums with FlagsAttribute
+ {
+ Public = 0,
+ Internal = 1,
+ Private = 2,
+ Friend = Internal,
+ }
+ }
+}
diff --git a/src/libraries/Common/tests/SourceGenerators/RoslynTestUtils.cs b/src/libraries/Common/tests/SourceGenerators/RoslynTestUtils.cs
index 4928270b06f170..23b1d5959aced5 100644
--- a/src/libraries/Common/tests/SourceGenerators/RoslynTestUtils.cs
+++ b/src/libraries/Common/tests/SourceGenerators/RoslynTestUtils.cs
@@ -48,10 +48,10 @@ public static Project CreateTestProject(IEnumerable? references, bool
}
return new AdhocWorkspace()
- .AddSolution(SolutionInfo.Create(SolutionId.CreateNewId(), VersionStamp.Create()))
- .AddProject("Test", "test.dll", "C#")
- .WithMetadataReferences(refs)
- .WithCompilationOptions(new CSharpCompilationOptions(OutputKind.DynamicallyLinkedLibrary).WithNullableContextOptions(NullableContextOptions.Enable));
+ .AddSolution(SolutionInfo.Create(SolutionId.CreateNewId(), VersionStamp.Create()))
+ .AddProject("Test", "test.dll", "C#")
+ .WithMetadataReferences(refs)
+ .WithCompilationOptions(new CSharpCompilationOptions(OutputKind.DynamicallyLinkedLibrary).WithNullableContextOptions(NullableContextOptions.Enable));
}
public static Task CommitChanges(this Project proj, params string[] ignorables)
@@ -141,23 +141,44 @@ public static TextSpan MakeSpan(string text, int spanNum)
/// Runs a Roslyn generator over a set of source files.
///
public static async Task<(ImmutableArray, ImmutableArray)> RunGenerator(
+#if ROSLYN4_0_OR_GREATER
+ IIncrementalGenerator generator,
+#else
ISourceGenerator generator,
+#endif
IEnumerable? references,
IEnumerable sources,
- AnalyzerConfigOptionsProvider? optionsProvider = null,
bool includeBaseReferences = true,
CancellationToken cancellationToken = default)
{
Project proj = CreateTestProject(references, includeBaseReferences);
-
proj = proj.WithDocuments(sources);
-
Assert.True(proj.Solution.Workspace.TryApplyChanges(proj.Solution));
-
Compilation? comp = await proj!.GetCompilationAsync(CancellationToken.None).ConfigureAwait(false);
+ return RunGenerator(comp!, generator, cancellationToken);
+ }
- CSharpGeneratorDriver cgd = CSharpGeneratorDriver.Create(new[] { generator }, optionsProvider: optionsProvider);
- GeneratorDriver gd = cgd.RunGenerators(comp!, cancellationToken);
+ ///
+ /// Runs a Roslyn generator given a Compilation.
+ ///
+ public static (ImmutableArray, ImmutableArray) RunGenerator(
+ Compilation compilation,
+#if ROSLYN4_0_OR_GREATER
+ IIncrementalGenerator generator,
+#else
+ ISourceGenerator generator,
+#endif
+ CancellationToken cancellationToken = default)
+ {
+#if ROSLYN4_0_OR_GREATER
+ // workaround https://github.com/dotnet/roslyn/pull/55866. We can remove "LangVersion=Preview" when we get a Roslyn build with that change.
+ CSharpParseOptions options = CSharpParseOptions.Default.WithLanguageVersion(LanguageVersion.Preview);
+ CSharpGeneratorDriver cgd = CSharpGeneratorDriver.Create(new[] { generator.AsSourceGenerator() }, parseOptions: options);
+#else
+ CSharpGeneratorDriver cgd = CSharpGeneratorDriver.Create(new[] { generator });
+#endif
+
+ GeneratorDriver gd = cgd.RunGenerators(compilation, cancellationToken);
GeneratorDriverRunResult r = gd.GetRunResult();
return (r.Results[0].Diagnostics, r.Results[0].GeneratedSources);
diff --git a/src/libraries/Common/tests/System/Net/EnterpriseTests/setup/linuxclient/Dockerfile b/src/libraries/Common/tests/System/Net/EnterpriseTests/setup/linuxclient/Dockerfile
index 8bb94ba8aa9924..853582e7bcf3c1 100644
--- a/src/libraries/Common/tests/System/Net/EnterpriseTests/setup/linuxclient/Dockerfile
+++ b/src/libraries/Common/tests/System/Net/EnterpriseTests/setup/linuxclient/Dockerfile
@@ -1,31 +1,12 @@
-# Switch to mcr.microsoft.com/dotnet-buildtools/prereqs ubuntu 18.04 images when they are fixed
-FROM ubuntu:18.04
+FROM mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-20211022152710-047508b
# Prevents dialog prompting when installing packages
ARG DEBIAN_FRONTEND=noninteractive
-# This 'RUN' step can be removed once dotnet-buildtools/prereqs image is fixed
-#
-# Makes the image capable of building and running tests in dotnet-runtime repo.
-# Add retries to apt-get since the ubuntu package servers have had errors lately such as:
-# "E: Failed to fetch http://archive.ubuntu.com/ubuntu/pool/main/p/publicsuffix/publicsuffix_20180223.1310-1_all.deb Undetermined Error [IP: 91.189.88.31 80]"
-ARG APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1
-RUN echo "APT::Acquire::Retries \"10\";" > /etc/apt/apt.conf.d/80-retries && \
- apt-get update && \
- apt-get install -y --no-install-recommends apt-transport-https ca-certificates gnupg software-properties-common wget && \
- wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null | apt-key add - && \
- apt-add-repository 'deb https://apt.kitware.com/ubuntu/ bionic main' && \
- wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key 2>/dev/null | apt-key add - && \
- apt-add-repository 'deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic-9 main' && \
- apt-get update && \
- apt-get install -y --no-install-recommends cmake llvm-9 clang-9 lldb-6.0 liblldb-6.0-dev libunwind8 libunwind-dev gettext libicu-dev liblttng-ust-dev libssl-dev libnuma-dev libkrb5-dev locales && \
- locale-gen en_US.UTF-8 && \
- update-locale LANG=en_US.UTF-8
-
# Install Kerberos, NTLM, and diagnostic tools
COPY ./common/krb5.conf /etc/krb5.conf
RUN apt-get update && \
- apt-get install -y --no-install-recommends krb5-user gss-ntlmssp iputils-ping dnsutils nano curl
+ apt-get install -y --no-install-recommends krb5-user gss-ntlmssp iputils-ping dnsutils nano
# Set environment variable to turn on enterprise tests
ENV DOTNET_RUNTIME_ENTERPRISETESTS_ENABLED 1
diff --git a/src/libraries/Common/tests/System/Net/Http/Http3LoopbackStream.cs b/src/libraries/Common/tests/System/Net/Http/Http3LoopbackStream.cs
index 958cb2abc1e156..346098414b39bd 100644
--- a/src/libraries/Common/tests/System/Net/Http/Http3LoopbackStream.cs
+++ b/src/libraries/Common/tests/System/Net/Http/Http3LoopbackStream.cs
@@ -20,10 +20,10 @@ internal sealed class Http3LoopbackStream : IDisposable
private const int MaximumVarIntBytes = 8;
private const long VarIntMax = (1L << 62) - 1;
- private const long DataFrame = 0x0;
- private const long HeadersFrame = 0x1;
- private const long SettingsFrame = 0x4;
- private const long GoAwayFrame = 0x7;
+ public const long DataFrame = 0x0;
+ public const long HeadersFrame = 0x1;
+ public const long SettingsFrame = 0x4;
+ public const long GoAwayFrame = 0x7;
public const long ControlStream = 0x0;
public const long PushStream = 0x1;
diff --git a/src/libraries/Common/tests/System/Net/Http/HttpClientHandlerTest.Authentication.cs b/src/libraries/Common/tests/System/Net/Http/HttpClientHandlerTest.Authentication.cs
index 41718d37eb869e..7d0a476dd1a951 100644
--- a/src/libraries/Common/tests/System/Net/Http/HttpClientHandlerTest.Authentication.cs
+++ b/src/libraries/Common/tests/System/Net/Http/HttpClientHandlerTest.Authentication.cs
@@ -203,7 +203,7 @@ public static IEnumerable Authentication_TestData()
{
yield return new object[] { "Basic realm=\"testrealm\"", true };
yield return new object[] { "Basic ", true };
- yield return new object[] { "Basic realm=withoutquotes", true };
+ yield return new object[] { "Basic realm=PLACEHOLDERwithoutquotes", true };
yield return new object[] { "basic ", true };
yield return new object[] { "bAsiC ", true };
yield return new object[] { "basic", true };
diff --git a/src/libraries/Common/tests/System/Net/Http/HttpClientHandlerTest.Decompression.cs b/src/libraries/Common/tests/System/Net/Http/HttpClientHandlerTest.Decompression.cs
index 88ac334a06de97..439cadf32ae620 100644
--- a/src/libraries/Common/tests/System/Net/Http/HttpClientHandlerTest.Decompression.cs
+++ b/src/libraries/Common/tests/System/Net/Http/HttpClientHandlerTest.Decompression.cs
@@ -4,6 +4,7 @@
using System.Collections.Generic;
using System.IO;
using System.IO.Compression;
+using System.Linq;
using System.Net.Test.Common;
using System.Text.RegularExpressions;
using System.Threading.Tasks;
@@ -26,19 +27,29 @@ public abstract class HttpClientHandler_Decompression_Test : HttpClientHandlerTe
#endif
public HttpClientHandler_Decompression_Test(ITestOutputHelper output) : base(output) { }
+ public static IEnumerable DecompressedResponse_MethodSpecified_DecompressedContentReturned_MemberData() =>
+ from compressionName in new[] { "gzip", "zlib", "deflate", "br" }
+ from all in new[] { false, true }
+ from copyTo in new[] { false, true }
+ from contentLength in new[] { 0, 1, 12345 }
+ select new object[] { compressionName, all, copyTo, contentLength };
+
[Theory]
- [InlineData("gzip", false)]
- [InlineData("gzip", true)]
- [InlineData("deflate", false)]
- [InlineData("deflate", true)]
- [InlineData("br", false)]
- [InlineData("br", true)]
+ [MemberData(nameof(DecompressedResponse_MethodSpecified_DecompressedContentReturned_MemberData))]
[SkipOnPlatform(TestPlatforms.Browser, "AutomaticDecompression not supported on Browser")]
- public async Task DecompressedResponse_MethodSpecified_DecompressedContentReturned(string encodingName, bool all)
+ public async Task DecompressedResponse_MethodSpecified_DecompressedContentReturned(string compressionName, bool all, bool useCopyTo, int contentLength)
{
+ if (IsWinHttpHandler &&
+ (compressionName == "br" || compressionName == "zlib"))
+ {
+ // brotli and zlib not supported on WinHttpHandler
+ return;
+ }
+
Func compress;
DecompressionMethods methods;
- switch (encodingName)
+ string encodingName = compressionName;
+ switch (compressionName)
{
case "gzip":
compress = s => new GZipStream(s, CompressionLevel.Optimal, leaveOpen: true);
@@ -47,32 +58,27 @@ public async Task DecompressedResponse_MethodSpecified_DecompressedContentReturn
#if !NETFRAMEWORK
case "br":
- if (IsWinHttpHandler)
- {
- // Brotli only supported on SocketsHttpHandler.
- return;
- }
-
compress = s => new BrotliStream(s, CompressionLevel.Optimal, leaveOpen: true);
methods = all ? DecompressionMethods.Brotli : _all;
break;
- case "deflate":
- // WinHttpHandler continues to use DeflateStream as it doesn't have a newer build than netstandard2.0
- // and doesn't have access to ZLibStream.
- compress = IsWinHttpHandler ?
- new Func(s => new DeflateStream(s, CompressionLevel.Optimal, leaveOpen: true)) :
- new Func(s => new ZLibStream(s, CompressionLevel.Optimal, leaveOpen: true));
+ case "zlib":
+ compress = s => new ZLibStream(s, CompressionLevel.Optimal, leaveOpen: true);
methods = all ? DecompressionMethods.Deflate : _all;
+ encodingName = "deflate";
break;
#endif
+ case "deflate":
+ compress = s => new DeflateStream(s, CompressionLevel.Optimal, leaveOpen: true);
+ methods = all ? DecompressionMethods.Deflate : _all;
+ break;
+
default:
- Assert.Contains(encodingName, new[] { "br", "deflate", "gzip" });
- return;
+ throw new Exception($"Unexpected compression: {compressionName}");
}
- var expectedContent = new byte[12345];
+ var expectedContent = new byte[contentLength];
new Random(42).NextBytes(expectedContent);
await LoopbackServer.CreateClientAndServerAsync(async uri =>
@@ -81,7 +87,7 @@ await LoopbackServer.CreateClientAndServerAsync(async uri =>
using (HttpClient client = CreateHttpClient(handler))
{
handler.AutomaticDecompression = methods;
- Assert.Equal(expectedContent, await client.GetByteArrayAsync(uri));
+ AssertExtensions.SequenceEqual(expectedContent, await client.GetByteArrayAsync(TestAsync, useCopyTo, uri));
}
}, async server =>
{
@@ -99,33 +105,39 @@ await server.AcceptConnectionAsync(async connection =>
public static IEnumerable DecompressedResponse_MethodNotSpecified_OriginalContentReturned_MemberData()
{
- yield return new object[]
+ foreach (bool useCopyTo in new[] { false, true })
{
- "gzip",
- new Func(s => new GZipStream(s, CompressionLevel.Optimal, leaveOpen: true)),
- DecompressionMethods.None
- };
+ yield return new object[]
+ {
+ "gzip",
+ new Func(s => new GZipStream(s, CompressionLevel.Optimal, leaveOpen: true)),
+ DecompressionMethods.None,
+ useCopyTo
+ };
#if !NETFRAMEWORK
- yield return new object[]
- {
- "deflate",
- new Func(s => new ZLibStream(s, CompressionLevel.Optimal, leaveOpen: true)),
- DecompressionMethods.Brotli
- };
- yield return new object[]
- {
- "br",
- new Func(s => new BrotliStream(s, CompressionLevel.Optimal, leaveOpen: true)),
- DecompressionMethods.Deflate | DecompressionMethods.GZip
- };
+ yield return new object[]
+ {
+ "deflate",
+ new Func(s => new ZLibStream(s, CompressionLevel.Optimal, leaveOpen: true)),
+ DecompressionMethods.Brotli,
+ useCopyTo
+ };
+ yield return new object[]
+ {
+ "br",
+ new Func(s => new BrotliStream(s, CompressionLevel.Optimal, leaveOpen: true)),
+ DecompressionMethods.Deflate | DecompressionMethods.GZip,
+ useCopyTo
+ };
#endif
+ }
}
[Theory]
[MemberData(nameof(DecompressedResponse_MethodNotSpecified_OriginalContentReturned_MemberData))]
[SkipOnPlatform(TestPlatforms.Browser, "AutomaticDecompression not supported on Browser")]
public async Task DecompressedResponse_MethodNotSpecified_OriginalContentReturned(
- string encodingName, Func compress, DecompressionMethods methods)
+ string encodingName, Func compress, DecompressionMethods methods, bool useCopyTo)
{
var expectedContent = new byte[12345];
new Random(42).NextBytes(expectedContent);
@@ -143,7 +155,7 @@ await LoopbackServer.CreateClientAndServerAsync(async uri =>
using (HttpClient client = CreateHttpClient(handler))
{
handler.AutomaticDecompression = methods;
- Assert.Equal(compressedContent, await client.GetByteArrayAsync(uri));
+ AssertExtensions.SequenceEqual(compressedContent, await client.GetByteArrayAsync(TestAsync, useCopyTo, uri));
}
}, async server =>
{
@@ -156,6 +168,33 @@ await server.AcceptConnectionAsync(async connection =>
});
}
+ [Theory]
+ [InlineData("gzip", DecompressionMethods.GZip)]
+#if !NETFRAMEWORK
+ [InlineData("deflate", DecompressionMethods.Deflate)]
+ [InlineData("br", DecompressionMethods.Brotli)]
+#endif
+ [SkipOnPlatform(TestPlatforms.Browser, "AutomaticDecompression not supported on Browser")]
+ public async Task DecompressedResponse_EmptyBody_Success(string encodingName, DecompressionMethods methods)
+ {
+ await LoopbackServer.CreateClientAndServerAsync(async uri =>
+ {
+ using (HttpClientHandler handler = CreateHttpClientHandler())
+ using (HttpClient client = CreateHttpClient(handler))
+ {
+ handler.AutomaticDecompression = methods;
+ Assert.Equal(Array.Empty(), await client.GetByteArrayAsync(TestAsync, useCopyTo: false, uri));
+ }
+ }, async server =>
+ {
+ await server.AcceptConnectionAsync(async connection =>
+ {
+ await connection.ReadRequestHeaderAsync();
+ await connection.WriteStringAsync($"HTTP/1.1 200 OK\r\nContent-Encoding: {encodingName}\r\n\r\n");
+ });
+ });
+ }
+
[Theory]
#if NETCOREAPP
[InlineData(DecompressionMethods.Brotli, "br", "")]
diff --git a/src/libraries/Common/tests/System/Net/Http/HttpClientHandlerTest.RemoteServer.cs b/src/libraries/Common/tests/System/Net/Http/HttpClientHandlerTest.RemoteServer.cs
index 9fd29a905f97f2..5e8b94d33705cc 100644
--- a/src/libraries/Common/tests/System/Net/Http/HttpClientHandlerTest.RemoteServer.cs
+++ b/src/libraries/Common/tests/System/Net/Http/HttpClientHandlerTest.RemoteServer.cs
@@ -136,7 +136,7 @@ public async Task GetAsync_ServerNeedsBasicAuthAndSetDefaultCredentials_StatusCo
handler.Credentials = CredentialCache.DefaultCredentials;
using (HttpClient client = CreateHttpClientForRemoteServer(remoteServer, handler))
{
- Uri uri = remoteServer.BasicAuthUriForCreds(userName: Username, password: Password);
+ Uri uri = remoteServer.BasicAuthUriForCreds(Username, Password);
using (HttpResponseMessage response = await client.GetAsync(uri))
{
Assert.Equal(HttpStatusCode.Unauthorized, response.StatusCode);
@@ -153,7 +153,7 @@ public async Task GetAsync_ServerNeedsAuthAndSetCredential_StatusCodeOK(Configur
handler.Credentials = _credential;
using (HttpClient client = CreateHttpClientForRemoteServer(remoteServer, handler))
{
- Uri uri = remoteServer.BasicAuthUriForCreds(userName: Username, password: Password);
+ Uri uri = remoteServer.BasicAuthUriForCreds(Username, Password);
using (HttpResponseMessage response = await client.GetAsync(uri))
{
Assert.Equal(HttpStatusCode.OK, response.StatusCode);
@@ -167,7 +167,7 @@ public async Task GetAsync_ServerNeedsAuthAndNoCredential_StatusCodeUnauthorized
{
using (HttpClient client = CreateHttpClientForRemoteServer(remoteServer))
{
- Uri uri = remoteServer.BasicAuthUriForCreds(userName: Username, password: Password);
+ Uri uri = remoteServer.BasicAuthUriForCreds(Username, Password);
using (HttpResponseMessage response = await client.GetAsync(uri))
{
Assert.Equal(HttpStatusCode.Unauthorized, response.StatusCode);
@@ -1033,7 +1033,7 @@ public async Task GetAsync_AllowAutoRedirectTrue_RedirectToUriWithParams_Request
{
HttpClientHandler handler = CreateHttpClientHandler();
handler.AllowAutoRedirect = true;
- Uri targetUri = remoteServer.BasicAuthUriForCreds(userName: Username, password: Password);
+ Uri targetUri = remoteServer.BasicAuthUriForCreds(Username, Password);
using (HttpClient client = CreateHttpClientForRemoteServer(remoteServer, handler))
{
Uri uri = remoteServer.RedirectUriForDestinationUri(
@@ -1133,8 +1133,8 @@ public async Task GetAsync_CredentialIsNetworkCredentialUriRedirect_StatusCodeUn
{
Uri redirectUri = remoteServer.RedirectUriForCreds(
statusCode: 302,
- userName: Username,
- password: Password);
+ Username,
+ Password);
using (HttpResponseMessage unAuthResponse = await client.GetAsync(redirectUri))
{
Assert.Equal(HttpStatusCode.Unauthorized, unAuthResponse.StatusCode);
@@ -1153,15 +1153,15 @@ public async Task HttpClientHandler_CredentialIsNotCredentialCacheAfterRedirect_
{
Uri redirectUri = remoteServer.RedirectUriForCreds(
statusCode: 302,
- userName: Username,
- password: Password);
+ Username,
+ Password);
using (HttpResponseMessage unAuthResponse = await client.GetAsync(redirectUri))
{
Assert.Equal(HttpStatusCode.Unauthorized, unAuthResponse.StatusCode);
}
// Use the same handler to perform get request, authentication should succeed after redirect.
- Uri uri = remoteServer.BasicAuthUriForCreds(userName: Username, password: Password);
+ Uri uri = remoteServer.BasicAuthUriForCreds(Username, Password);
using (HttpResponseMessage authResponse = await client.GetAsync(uri))
{
Assert.Equal(HttpStatusCode.OK, authResponse.StatusCode);
@@ -1180,11 +1180,11 @@ public async Task GetAsync_CredentialIsCredentialCacheUriRedirect_StatusCodeOK(C
return;
}
- Uri uri = remoteServer.BasicAuthUriForCreds(userName: Username, password: Password);
+ Uri uri = remoteServer.BasicAuthUriForCreds(Username, Password);
Uri redirectUri = remoteServer.RedirectUriForCreds(
statusCode: statusCode,
- userName: Username,
- password: Password);
+ Username,
+ Password);
_output.WriteLine(uri.AbsoluteUri);
_output.WriteLine(redirectUri.AbsoluteUri);
var credentialCache = new CredentialCache();
@@ -1237,8 +1237,9 @@ public static IEnumerable RemoteServersAndCompressionUris()
{
yield return new object[] { remoteServer, remoteServer.GZipUri };
- // Remote deflate endpoint isn't correctly following the deflate protocol.
- //yield return new object[] { remoteServer, remoteServer.DeflateUri };
+ // Remote deflate endpoint isn't correctly following the deflate protocol,
+ // but SocketsHttpHandler makes it work, anyway.
+ yield return new object[] { remoteServer, remoteServer.DeflateUri };
}
}
@@ -1271,10 +1272,6 @@ public async Task GetAsync_SetAutomaticDecompression_ContentDecompressed_GZip(Co
}
}
- // The remote server endpoint was written to use DeflateStream, which isn't actually a correct
- // implementation of the deflate protocol (the deflate protocol requires the zlib wrapper around
- // deflate). Until we can get that updated (and deal with previous releases still testing it
- // via a DeflateStream-based implementation), we utilize httpbin.org to help validate behavior.
[OuterLoop("Uses external servers")]
[Theory]
[InlineData("http://httpbin.org/deflate", "\"deflated\": true")]
diff --git a/src/libraries/Common/tests/System/Net/Http/HttpClientHandlerTest.SslProtocols.cs b/src/libraries/Common/tests/System/Net/Http/HttpClientHandlerTest.SslProtocols.cs
index da250bf305f32c..5a643c09aec385 100644
--- a/src/libraries/Common/tests/System/Net/Http/HttpClientHandlerTest.SslProtocols.cs
+++ b/src/libraries/Common/tests/System/Net/Http/HttpClientHandlerTest.SslProtocols.cs
@@ -121,7 +121,7 @@ public async Task GetAsync_AllowedSSLVersion_Succeeds(SslProtocols acceptedProto
#if !NETFRAMEWORK
handler.SslProtocols = SslProtocols.Tls | SslProtocols.Tls11 | SslProtocols.Tls12 | SslProtocols.Tls13;
#else
- handler.SslProtocols = SslProtocols.Tls | SslProtocols.Tls11 | SslProtocols.Tls12;
+ handler.SslProtocols = SslProtocols.Tls | SslProtocols.Tls11 | SslProtocols.Tls12 | (SslProtocols)12288;
#endif
#pragma warning restore 0618
}
diff --git a/src/libraries/Common/tests/System/Net/Http/HttpClientHandlerTest.cs b/src/libraries/Common/tests/System/Net/Http/HttpClientHandlerTest.cs
index 17fcd64ee26d80..291611cd60ffcc 100644
--- a/src/libraries/Common/tests/System/Net/Http/HttpClientHandlerTest.cs
+++ b/src/libraries/Common/tests/System/Net/Http/HttpClientHandlerTest.cs
@@ -399,7 +399,7 @@ public async Task PostAsync_ManyDifferentRequestHeaders_SentCorrectly()
}
const string content = "hello world";
-
+ string authSafeValue = "QWxhZGRpbjpvcGVuIHNlc2FtZQ==";
// Using examples from https://en.wikipedia.org/wiki/List_of_HTTP_header_fields#Request_fields
// Exercises all exposed request.Headers and request.Content.Headers strongly-typed properties
await LoopbackServerFactory.CreateClientAndServerAsync(async uri =>
@@ -421,7 +421,7 @@ await LoopbackServerFactory.CreateClientAndServerAsync(async uri =>
request.Headers.Add("Access-Control-Request-Method", "GET");
request.Headers.Add("Access-Control-Request-Headers", "GET");
request.Headers.Add("Age", "12");
- request.Headers.Authorization = new AuthenticationHeaderValue("Basic", "QWxhZGRpbjpvcGVuIHNlc2FtZQ==");
+ request.Headers.Authorization = new AuthenticationHeaderValue("Basic", authSafeValue);
request.Headers.CacheControl = new CacheControlHeaderValue() { NoCache = true };
request.Headers.Connection.Add("close");
request.Headers.Add("Cookie", "$Version=1; Skin=new");
@@ -444,7 +444,7 @@ await LoopbackServerFactory.CreateClientAndServerAsync(async uri =>
request.Headers.MaxForwards = 10;
request.Headers.Add("Origin", "http://www.example-social-network.com");
request.Headers.Pragma.Add(new NameValueHeaderValue("no-cache"));
- request.Headers.ProxyAuthorization = new AuthenticationHeaderValue("Basic", "QWxhZGRpbjpvcGVuIHNlc2FtZQ==");
+ request.Headers.ProxyAuthorization = new AuthenticationHeaderValue("Basic", authSafeValue);
request.Headers.Range = new RangeHeaderValue(500, 999);
request.Headers.Referrer = new Uri("http://en.wikipedia.org/wiki/Main_Page");
request.Headers.TE.Add(new TransferCodingWithQualityHeaderValue("trailers"));
@@ -504,7 +504,7 @@ await LoopbackServerFactory.CreateClientAndServerAsync(async uri =>
Assert.Equal("GET", requestData.GetSingleHeaderValue("Access-Control-Request-Headers"));
}
Assert.Equal("12", requestData.GetSingleHeaderValue("Age"));
- Assert.Equal("Basic QWxhZGRpbjpvcGVuIHNlc2FtZQ==", requestData.GetSingleHeaderValue("Authorization"));
+ Assert.Equal($"Basic {authSafeValue}", requestData.GetSingleHeaderValue("Authorization"));
Assert.Equal("no-cache", requestData.GetSingleHeaderValue("Cache-Control"));
if (PlatformDetection.IsNotBrowser)
{
@@ -512,7 +512,7 @@ await LoopbackServerFactory.CreateClientAndServerAsync(async uri =>
Assert.Equal("Tue, 15 Nov 1994 08:12:31 GMT", requestData.GetSingleHeaderValue("Date"));
Assert.Equal("100-continue", requestData.GetSingleHeaderValue("Expect"));
Assert.Equal("http://www.example-social-network.com", requestData.GetSingleHeaderValue("Origin"));
- Assert.Equal("Basic QWxhZGRpbjpvcGVuIHNlc2FtZQ==", requestData.GetSingleHeaderValue("Proxy-Authorization"));
+ Assert.Equal($"Basic {authSafeValue}", requestData.GetSingleHeaderValue("Proxy-Authorization"));
Assert.Equal("Mozilla/5.0", requestData.GetSingleHeaderValue("User-Agent"));
Assert.Equal("http://en.wikipedia.org/wiki/Main_Page", requestData.GetSingleHeaderValue("Referer"));
Assert.Equal("MyTrailer", requestData.GetSingleHeaderValue("Trailer"));
diff --git a/src/libraries/Common/tests/System/Net/Http/HttpClientHandlerTestBase.cs b/src/libraries/Common/tests/System/Net/Http/HttpClientHandlerTestBase.cs
index 7d56c4ce48838b..798b23907cc9c0 100644
--- a/src/libraries/Common/tests/System/Net/Http/HttpClientHandlerTestBase.cs
+++ b/src/libraries/Common/tests/System/Net/Http/HttpClientHandlerTestBase.cs
@@ -196,5 +196,47 @@ public static Task ReadAsStreamAsync(this HttpContent content, bool asyn
#endif
}
}
+
+ public static Task GetByteArrayAsync(this HttpClient client, bool async, bool useCopyTo, Uri uri)
+ {
+#if NETCOREAPP
+ return Task.Run(async () =>
+ {
+ var m = new HttpRequestMessage(HttpMethod.Get, uri);
+ using HttpResponseMessage r = async ? await client.SendAsync(m, HttpCompletionOption.ResponseHeadersRead) : client.Send(m, HttpCompletionOption.ResponseHeadersRead);
+ using Stream s = async ? await r.Content.ReadAsStreamAsync() : r.Content.ReadAsStream();
+
+ var result = new MemoryStream();
+ if (useCopyTo)
+ {
+ if (async)
+ {
+ await s.CopyToAsync(result);
+ }
+ else
+ {
+ s.CopyTo(result);
+ }
+ }
+ else
+ {
+ byte[] buffer = new byte[100];
+ while (true)
+ {
+ int bytesRead = async ? await s.ReadAsync(buffer) : s.Read(buffer);
+ if (bytesRead == 0)
+ {
+ break;
+ }
+ result.Write(buffer.AsSpan(0, bytesRead));
+ }
+ }
+ return result.ToArray();
+ });
+#else
+ // For WinHttpHandler on .NET Framework, we fall back to ignoring async and useCopyTo.
+ return client.GetByteArrayAsync(uri);
+#endif
+ }
}
}
diff --git a/src/libraries/Common/tests/System/Net/Http/LoopbackServer.cs b/src/libraries/Common/tests/System/Net/Http/LoopbackServer.cs
index 7594b4908010fc..ff4b34630525bd 100644
--- a/src/libraries/Common/tests/System/Net/Http/LoopbackServer.cs
+++ b/src/libraries/Common/tests/System/Net/Http/LoopbackServer.cs
@@ -866,6 +866,12 @@ public override async Task ReadRequestBodyAsync()
return buffer;
}
+ public void CompleteRequestProcessing()
+ {
+ _contentLength = 0;
+ _bodyRead = false;
+ }
+
public override async Task SendResponseAsync(HttpStatusCode statusCode = HttpStatusCode.OK, IList headers = null, string content = "", bool isFinal = true, int requestId = 0)
{
MemoryStream headerBytes = new MemoryStream();
diff --git a/src/libraries/Common/tests/System/Net/Sockets/TestSettings.cs b/src/libraries/Common/tests/System/Net/Sockets/TestSettings.cs
index 0accade3d3f445..164b4b8632a43b 100644
--- a/src/libraries/Common/tests/System/Net/Sockets/TestSettings.cs
+++ b/src/libraries/Common/tests/System/Net/Sockets/TestSettings.cs
@@ -8,7 +8,8 @@ namespace System.Net.Sockets.Tests
public static class TestSettings
{
// Timeout values in milliseconds.
- public const int PassingTestTimeout = 10000;
+ public const int PassingTestTimeout = 10_000;
+ public const int PassingTestLongTimeout = 30_000;
public const int FailingTestTimeout = 100;
public static Task WhenAllOrAnyFailedWithTimeout(params Task[] tasks) => tasks.WhenAllOrAnyFailed(PassingTestTimeout);
diff --git a/src/libraries/Common/tests/System/Runtime/Serialization/Utils.cs b/src/libraries/Common/tests/System/Runtime/Serialization/Utils.cs
index ca01381a6dff10..2e2ac299c2c53b 100644
--- a/src/libraries/Common/tests/System/Runtime/Serialization/Utils.cs
+++ b/src/libraries/Common/tests/System/Runtime/Serialization/Utils.cs
@@ -9,6 +9,8 @@
using System.Threading.Tasks;
using System.Xml.Linq;
using System.Linq;
+using System.Reflection;
+using System.Runtime.Loader;
using Xunit;
internal static class Utils
@@ -351,3 +353,30 @@ private static bool IsPrefixedAttributeValue(string atrValue, out string localPr
return false;
}
}
+
+internal class TestAssemblyLoadContext : AssemblyLoadContext
+{
+ private AssemblyDependencyResolver _resolver;
+
+ public TestAssemblyLoadContext(string name, bool isCollectible, string mainAssemblyToLoadPath = null) : base(name, isCollectible)
+ {
+ if (!PlatformDetection.IsBrowser)
+ _resolver = new AssemblyDependencyResolver(mainAssemblyToLoadPath ?? Assembly.GetExecutingAssembly().Location);
+ }
+
+ protected override Assembly Load(AssemblyName name)
+ {
+ if (PlatformDetection.IsBrowser)
+ {
+ return base.Load(name);
+ }
+
+ string assemblyPath = _resolver.ResolveAssemblyToPath(name);
+ if (assemblyPath != null)
+ {
+ return LoadFromAssemblyPath(assemblyPath);
+ }
+
+ return null;
+ }
+}
diff --git a/src/libraries/Common/tests/System/Security/Cryptography/AlgorithmImplementations/ECDiffieHellman/ECDhKeyFileTests.cs b/src/libraries/Common/tests/System/Security/Cryptography/AlgorithmImplementations/ECDiffieHellman/ECDhKeyFileTests.cs
index 2b814f581f90d5..197fcc49f113b7 100644
--- a/src/libraries/Common/tests/System/Security/Cryptography/AlgorithmImplementations/ECDiffieHellman/ECDhKeyFileTests.cs
+++ b/src/libraries/Common/tests/System/Security/Cryptography/AlgorithmImplementations/ECDiffieHellman/ECDhKeyFileTests.cs
@@ -7,6 +7,7 @@
namespace System.Security.Cryptography.EcDiffieHellman.Tests
{
[SkipOnPlatform(TestPlatforms.Browser, "Not supported on Browser")]
+ [ActiveIssue("https://github.com/dotnet/runtime/issues/64389", TestPlatforms.Windows)]
public class ECDhKeyFileTests : ECKeyFileTests
{
protected override ECDiffieHellman CreateKey()
diff --git a/src/libraries/Common/tests/System/Security/Cryptography/AlgorithmImplementations/ECDsa/ECDsaKeyFileTests.cs b/src/libraries/Common/tests/System/Security/Cryptography/AlgorithmImplementations/ECDsa/ECDsaKeyFileTests.cs
index 46f88abb735a0d..d95a3f060622ec 100644
--- a/src/libraries/Common/tests/System/Security/Cryptography/AlgorithmImplementations/ECDsa/ECDsaKeyFileTests.cs
+++ b/src/libraries/Common/tests/System/Security/Cryptography/AlgorithmImplementations/ECDsa/ECDsaKeyFileTests.cs
@@ -7,6 +7,7 @@
namespace System.Security.Cryptography.EcDsa.Tests
{
[SkipOnPlatform(TestPlatforms.Browser, "Not supported on Browser")]
+ [ActiveIssue("https://github.com/dotnet/runtime/issues/64389", TestPlatforms.Windows)]
public class ECDsaKeyFileTests : ECKeyFileTests
{
protected override ECDsa CreateKey()
diff --git a/src/libraries/Common/tests/TestUtilities/System/PlatformDetection.Unix.cs b/src/libraries/Common/tests/TestUtilities/System/PlatformDetection.Unix.cs
index 99492706f7ec99..db93bcd06c4550 100644
--- a/src/libraries/Common/tests/TestUtilities/System/PlatformDetection.Unix.cs
+++ b/src/libraries/Common/tests/TestUtilities/System/PlatformDetection.Unix.cs
@@ -41,6 +41,8 @@ public static partial class PlatformDetection
public static bool IsMacOsCatalinaOrHigher => IsOSX && Environment.OSVersion.Version >= new Version(10, 15);
public static bool IsMacOsAppleSilicon => IsOSX && IsArm64Process;
public static bool IsNotMacOsAppleSilicon => !IsMacOsAppleSilicon;
+ public static bool IsAppSandbox => Environment.GetEnvironmentVariable("APP_SANDBOX_CONTAINER_ID") != null;
+ public static bool IsNotAppSandbox => !IsAppSandbox;
// RedHat family covers RedHat and CentOS
public static bool IsRedHatFamily => IsRedHatFamilyAndVersion();
@@ -55,6 +57,11 @@ public static partial class PlatformDetection
GetOpenSslVersion() :
throw new PlatformNotSupportedException();
+ private static readonly Version s_openssl3Version = new Version(3, 0, 0);
+ public static bool IsOpenSsl3 => !IsOSXLike && !IsWindows && !IsAndroid && !IsBrowser ?
+ GetOpenSslVersion() >= s_openssl3Version :
+ false;
+
///
/// If gnulibc is available, returns the release, such as "stable".
/// Otherwise returns "glibc_not_found".
diff --git a/src/libraries/Common/tests/TestUtilities/System/PlatformDetection.Windows.cs b/src/libraries/Common/tests/TestUtilities/System/PlatformDetection.Windows.cs
index 078f29be48e685..cf5e4b86b87b84 100644
--- a/src/libraries/Common/tests/TestUtilities/System/PlatformDetection.Windows.cs
+++ b/src/libraries/Common/tests/TestUtilities/System/PlatformDetection.Windows.cs
@@ -57,6 +57,9 @@ public static partial class PlatformDetection
public static bool IsWindows10Version2004Build19573OrGreater => IsWindowsVersionOrLater(10, 0, 19573);
+ // Windows 11 aka 21H2
+ public static bool IsWindows10Version22000OrGreater => IsWindowsVersionOrLater(10, 0, 22000);
+
public static bool IsWindowsIoTCore
{
get
@@ -231,6 +234,8 @@ public static bool IsInAppContainer
}
}
+ public static bool CanRunImpersonatedTests => PlatformDetection.IsNotWindowsNanoServer && PlatformDetection.IsWindowsAndElevated;
+
private static int s_isWindowsElevated = -1;
public static bool IsWindowsAndElevated
{
diff --git a/src/libraries/Common/tests/TestUtilities/System/PlatformDetection.cs b/src/libraries/Common/tests/TestUtilities/System/PlatformDetection.cs
index efef067dbce645..6b77b65fefd101 100644
--- a/src/libraries/Common/tests/TestUtilities/System/PlatformDetection.cs
+++ b/src/libraries/Common/tests/TestUtilities/System/PlatformDetection.cs
@@ -48,6 +48,7 @@ public static partial class PlatformDetection
public static bool IsNotArm64Process => !IsArm64Process;
public static bool IsArmOrArm64Process => IsArmProcess || IsArm64Process;
public static bool IsNotArmNorArm64Process => !IsArmOrArm64Process;
+ public static bool IsX86Process => RuntimeInformation.ProcessArchitecture == Architecture.X86;
public static bool IsArgIteratorSupported => IsMonoRuntime || (IsWindows && IsNotArmProcess);
public static bool IsArgIteratorNotSupported => !IsArgIteratorSupported;
public static bool Is32BitProcess => IntPtr.Size == 4;
@@ -189,7 +190,12 @@ private static bool GetAlpnSupport()
if (IsOpenSslSupported)
{
- return OpenSslVersion.Major >= 1 && (OpenSslVersion.Minor >= 1 || OpenSslVersion.Build >= 2);
+ if (OpenSslVersion.Major >= 3)
+ {
+ return true;
+ }
+
+ return OpenSslVersion.Major == 1 && (OpenSslVersion.Minor >= 1 || OpenSslVersion.Build >= 2);
}
if (IsAndroid)
@@ -267,6 +273,28 @@ private static bool GetStaticNonPublicBooleanPropertyValue(string typeName, stri
public static bool IsIcuGlobalization => ICUVersion > new Version(0,0,0,0);
public static bool IsNlsGlobalization => IsNotInvariantGlobalization && !IsIcuGlobalization;
+ public static bool IsSubstAvailable
+ {
+ get
+ {
+ try
+ {
+ if (IsWindows)
+ {
+ string systemRoot = Environment.GetEnvironmentVariable("SystemRoot");
+ if (string.IsNullOrWhiteSpace(systemRoot))
+ {
+ return false;
+ }
+ string system32 = Path.Combine(systemRoot, "System32");
+ return File.Exists(Path.Combine(system32, "subst.exe"));
+ }
+ }
+ catch { }
+ return false;
+ }
+ }
+
private static Version GetICUVersion()
{
int version = 0;
diff --git a/src/libraries/Common/tests/TestUtilities/System/WindowsIdentityFixture.cs b/src/libraries/Common/tests/TestUtilities/System/WindowsIdentityFixture.cs
new file mode 100644
index 00000000000000..b0355f923295e4
--- /dev/null
+++ b/src/libraries/Common/tests/TestUtilities/System/WindowsIdentityFixture.cs
@@ -0,0 +1,148 @@
+// 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.ComponentModel;
+using System.Linq;
+using System.Net;
+using System.Runtime.InteropServices;
+using System.Security.Cryptography;
+using System.Security.Principal;
+using System.Threading.Tasks;
+using Microsoft.Win32.SafeHandles;
+using Xunit;
+
+namespace System
+{
+ public class WindowsIdentityFixture : IDisposable
+ {
+ public WindowsTestAccount TestAccount { get; private set; }
+
+ public WindowsIdentityFixture()
+ {
+ TestAccount = new WindowsTestAccount("CorFxTstWiIde01kiu");
+ }
+
+ public void Dispose()
+ {
+ TestAccount.Dispose();
+ }
+ }
+
+ public sealed class WindowsTestAccount : IDisposable
+ {
+ private readonly string _userName;
+ private SafeAccessTokenHandle _accountTokenHandle;
+ public SafeAccessTokenHandle AccountTokenHandle => _accountTokenHandle;
+ public string AccountName { get; private set; }
+
+ public WindowsTestAccount(string userName)
+ {
+ Assert.True(PlatformDetection.IsWindowsAndElevated);
+
+ _userName = userName;
+ CreateUser();
+ }
+
+ private void CreateUser()
+ {
+ string testAccountPassword;
+ using (RandomNumberGenerator rng = RandomNumberGenerator.Create())
+ {
+ byte[] randomBytes = new byte[33];
+ rng.GetBytes(randomBytes);
+
+ // Add special chars to ensure it satisfies password requirements.
+ testAccountPassword = Convert.ToBase64String(randomBytes) + "_-As@!%*(1)4#2";
+
+ USER_INFO_1 userInfo = new USER_INFO_1
+ {
+ usri1_name = _userName,
+ usri1_password = testAccountPassword,
+ usri1_priv = 1
+ };
+
+ // Create user and remove/create if already exists
+ uint result = NetUserAdd(null, 1, ref userInfo, out uint param_err);
+
+ // error codes https://docs.microsoft.com/en-us/windows/desktop/netmgmt/network-management-error-codes
+ // 0 == NERR_Success
+ if (result == 2224) // NERR_UserExists
+ {
+ result = NetUserDel(null, userInfo.usri1_name);
+ if (result != 0)
+ {
+ throw new Win32Exception((int)result);
+ }
+ result = NetUserAdd(null, 1, ref userInfo, out param_err);
+ if (result != 0)
+ {
+ throw new Win32Exception((int)result);
+ }
+ }
+ else if (result != 0)
+ {
+ throw new Win32Exception((int)result);
+ }
+
+ const int LOGON32_PROVIDER_DEFAULT = 0;
+ const int LOGON32_LOGON_INTERACTIVE = 2;
+
+ if (!LogonUser(_userName, ".", testAccountPassword, LOGON32_LOGON_INTERACTIVE, LOGON32_PROVIDER_DEFAULT, out _accountTokenHandle))
+ {
+ _accountTokenHandle = null;
+ throw new Exception($"Failed to get SafeAccessTokenHandle for test account {_userName}", new Win32Exception());
+ }
+
+ bool gotRef = false;
+ try
+ {
+ _accountTokenHandle.DangerousAddRef(ref gotRef);
+ IntPtr logonToken = _accountTokenHandle.DangerousGetHandle();
+ AccountName = new WindowsIdentity(logonToken).Name;
+ }
+ finally
+ {
+ if (gotRef)
+ _accountTokenHandle.DangerousRelease();
+ }
+ }
+ }
+
+ [DllImport("advapi32.dll", SetLastError = true, CharSet = CharSet.Unicode)]
+ private static extern bool LogonUser(string userName, string domain, string password, int logonType, int logonProvider, out SafeAccessTokenHandle safeAccessTokenHandle);
+
+ [DllImport("netapi32.dll", CharSet = CharSet.Unicode, SetLastError = true)]
+ internal static extern uint NetUserAdd([MarshalAs(UnmanagedType.LPWStr)]string servername, uint level, ref USER_INFO_1 buf, out uint parm_err);
+
+ [DllImport("netapi32.dll")]
+ internal static extern uint NetUserDel([MarshalAs(UnmanagedType.LPWStr)]string servername, [MarshalAs(UnmanagedType.LPWStr)]string username);
+
+ [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Unicode)]
+ internal struct USER_INFO_1
+ {
+ public string usri1_name;
+ public string usri1_password;
+ public uint usri1_password_age;
+ public uint usri1_priv;
+ public string usri1_home_dir;
+ public string usri1_comment;
+ public uint usri1_flags;
+ public string usri1_script_path;
+ }
+
+ public void Dispose()
+ {
+ _accountTokenHandle?.Dispose();
+
+ uint result = NetUserDel(null, _userName);
+
+ // 2221= NERR_UserNotFound
+ if (result != 0 && result != 2221)
+ {
+ throw new Win32Exception((int)result);
+ }
+ }
+ }
+ }
+
diff --git a/src/libraries/Common/tests/TestUtilities/TestUtilities.csproj b/src/libraries/Common/tests/TestUtilities/TestUtilities.csproj
index 375fca4e582f8d..8400cd7e721e69 100644
--- a/src/libraries/Common/tests/TestUtilities/TestUtilities.csproj
+++ b/src/libraries/Common/tests/TestUtilities/TestUtilities.csproj
@@ -33,6 +33,7 @@
+
+
-
-
diff --git a/src/libraries/Directory.Build.props b/src/libraries/Directory.Build.props
index e81806e83421f2..85f79abb6ce913 100644
--- a/src/libraries/Directory.Build.props
+++ b/src/libraries/Directory.Build.props
@@ -25,6 +25,13 @@
+
+
+ true
+
+
+
+
false
@@ -109,6 +116,9 @@
$(TestArchiveTestsRoot)$(OSPlatformConfig)/
$(TestArchiveRoot)runtime/
+ true
+ $(ArtifactsDir)bundles\
+
$([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'ref', '$(NetCoreAppCurrent)'))
$([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'runtime', '$(NetCoreAppCurrent)-$(TargetOS)-$(Configuration)-$(TargetArchitecture)'))
@@ -138,7 +148,7 @@
$([MSBuild]::NormalizeDirectory($(SdkWithNoWorkloadForTestingPath)))
$(SdkWithNoWorkloadForTestingPath)version-$(SdkVersionForWorkloadTesting).stamp
- $(SdkWithWorkloadForTestingPath)workload.stamp
+ $(SdkWithNoWorkloadForTestingPath)workload.stamp
$(ArtifactsBinDir)dotnet-workload\
$([MSBuild]::NormalizeDirectory($(SdkWithWorkloadForTestingPath)))
diff --git a/src/libraries/Directory.Build.targets b/src/libraries/Directory.Build.targets
index ca9b42f35ca9f1..a1e5b08838bbf6 100644
--- a/src/libraries/Directory.Build.targets
+++ b/src/libraries/Directory.Build.targets
@@ -218,8 +218,9 @@
+
- true
+ true
@@ -228,9 +229,11 @@
true
+ true
+
@@ -260,6 +263,7 @@
Returns="@(_AnalyzerPackFile)">
<_analyzerPath>analyzers/dotnet
+ <_analyzerPath Condition="'$(AnalyzerRoslynVersion)' != ''">$(_analyzerPath)/roslyn$(AnalyzerRoslynVersion)
<_analyzerPath Condition="'$(AnalyzerLanguage)' != ''">$(_analyzerPath)/$(AnalyzerLanguage)
diff --git a/src/libraries/Microsoft.Bcl.AsyncInterfaces/src/CompatibilitySuppressions.xml b/src/libraries/Microsoft.Bcl.AsyncInterfaces/src/CompatibilitySuppressions.xml
deleted file mode 100644
index 13579d318e7039..00000000000000
--- a/src/libraries/Microsoft.Bcl.AsyncInterfaces/src/CompatibilitySuppressions.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
- CP0001
- lib/netstandard2.0/Microsoft.Bcl.AsyncInterfaces.dll
- lib/netstandard2.1/Microsoft.Bcl.AsyncInterfaces.dll
-
-
\ No newline at end of file
diff --git a/src/libraries/Microsoft.Diagnostics.Tracing.EventSource.Redist/src/Microsoft.Diagnostics.Tracing.EventSource.Redist.csproj b/src/libraries/Microsoft.Diagnostics.Tracing.EventSource.Redist/src/Microsoft.Diagnostics.Tracing.EventSource.Redist.csproj
index 9e17bd12e7cb72..6d2b9e91c040d9 100644
--- a/src/libraries/Microsoft.Diagnostics.Tracing.EventSource.Redist/src/Microsoft.Diagnostics.Tracing.EventSource.Redist.csproj
+++ b/src/libraries/Microsoft.Diagnostics.Tracing.EventSource.Redist/src/Microsoft.Diagnostics.Tracing.EventSource.Redist.csproj
@@ -10,7 +10,7 @@ Microsoft.Diagnostics.Tracing.EventSource
$(MSBuildProjectName)
Microsoft.Diagnostics.Tracing.EventSource
$(DefineConstants);NO_EVENTCOMMANDEXECUTED_SUPPORT;ES_BUILD_STANDALONE;FEATURE_MANAGED_ETW;TARGET_WINDOWS
- net461-windows
+ net461
enable
true
true
diff --git a/src/libraries/Microsoft.Diagnostics.Tracing.EventSource.Redist/tests/Microsoft.Diagnostics.Tracing.EventSource.Redist.Tests.csproj b/src/libraries/Microsoft.Diagnostics.Tracing.EventSource.Redist/tests/Microsoft.Diagnostics.Tracing.EventSource.Redist.Tests.csproj
index 46457b709cc375..7ad4466cda7690 100644
--- a/src/libraries/Microsoft.Diagnostics.Tracing.EventSource.Redist/tests/Microsoft.Diagnostics.Tracing.EventSource.Redist.Tests.csproj
+++ b/src/libraries/Microsoft.Diagnostics.Tracing.EventSource.Redist/tests/Microsoft.Diagnostics.Tracing.EventSource.Redist.Tests.csproj
@@ -2,7 +2,7 @@
$(DefineConstants);USE_MDT_EVENTSOURCE
true
- net461-windows
+ net461
..\..\System.Diagnostics.Tracing\tests
diff --git a/src/libraries/Microsoft.Extensions.Caching.Memory/Microsoft.Extensions.Caching.Memory.sln b/src/libraries/Microsoft.Extensions.Caching.Memory/Microsoft.Extensions.Caching.Memory.sln
index cbb219a495e05c..6fb211776e5f5c 100644
--- a/src/libraries/Microsoft.Extensions.Caching.Memory/Microsoft.Extensions.Caching.Memory.sln
+++ b/src/libraries/Microsoft.Extensions.Caching.Memory/Microsoft.Extensions.Caching.Memory.sln
@@ -23,8 +23,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Depend
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.DependencyInjection", "..\Microsoft.Extensions.DependencyInjection\src\Microsoft.Extensions.DependencyInjection.csproj", "{78971B06-2519-45B7-B761-C8A30C168EBE}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Logging.Generators", "..\Microsoft.Extensions.Logging.Abstractions\gen\Microsoft.Extensions.Logging.Generators.csproj", "{727A5FD3-0146-4E1E-81B6-E71D0C1A055E}"
-EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Logging.Abstractions", "..\Microsoft.Extensions.Logging.Abstractions\ref\Microsoft.Extensions.Logging.Abstractions.csproj", "{BDC4E2D9-627A-4DE2-BF31-A95351C1CB7C}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Logging.Abstractions", "..\Microsoft.Extensions.Logging.Abstractions\src\Microsoft.Extensions.Logging.Abstractions.csproj", "{C76753D0-F564-45E9-AA60-A846EFE0A414}"
@@ -121,10 +119,6 @@ Global
{21CD6C35-65E2-414A-B9A1-22A0DD57977A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{21CD6C35-65E2-414A-B9A1-22A0DD57977A}.Release|Any CPU.ActiveCfg = Release|Any CPU
{21CD6C35-65E2-414A-B9A1-22A0DD57977A}.Release|Any CPU.Build.0 = Release|Any CPU
- {727A5FD3-0146-4E1E-81B6-E71D0C1A055E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {727A5FD3-0146-4E1E-81B6-E71D0C1A055E}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {727A5FD3-0146-4E1E-81B6-E71D0C1A055E}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {727A5FD3-0146-4E1E-81B6-E71D0C1A055E}.Release|Any CPU.Build.0 = Release|Any CPU
{B6D30918-C1B7-4225-A809-E13A5817DE22}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B6D30918-C1B7-4225-A809-E13A5817DE22}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B6D30918-C1B7-4225-A809-E13A5817DE22}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -161,7 +155,6 @@ Global
{DA43AA92-35BA-4B84-BAA2-C3BB56C8BB3B} = {67719AA1-52DC-4E35-B6F7-2F53A50B913A}
{78971B06-2519-45B7-B761-C8A30C168EBE} = {67719AA1-52DC-4E35-B6F7-2F53A50B913A}
{21CD6C35-65E2-414A-B9A1-22A0DD57977A} = {67719AA1-52DC-4E35-B6F7-2F53A50B913A}
- {727A5FD3-0146-4E1E-81B6-E71D0C1A055E} = {67719AA1-52DC-4E35-B6F7-2F53A50B913A}
{B6D30918-C1B7-4225-A809-E13A5817DE22} = {67719AA1-52DC-4E35-B6F7-2F53A50B913A}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
diff --git a/src/libraries/Microsoft.Extensions.Caching.Memory/src/MemoryCache.cs b/src/libraries/Microsoft.Extensions.Caching.Memory/src/MemoryCache.cs
index 35121fc86ebc34..d9fa37e8cf8343 100644
--- a/src/libraries/Microsoft.Extensions.Caching.Memory/src/MemoryCache.cs
+++ b/src/libraries/Microsoft.Extensions.Caching.Memory/src/MemoryCache.cs
@@ -395,9 +395,10 @@ public void Compact(double percentage)
private void Compact(long removalSizeTarget, Func computeEntrySize)
{
var entriesToRemove = new List();
- var lowPriEntries = new List();
- var normalPriEntries = new List();
- var highPriEntries = new List();
+ // cache LastAccessed outside of the CacheEntry so it is stable during compaction
+ var lowPriEntries = new List();
+ var normalPriEntries = new List();
+ var highPriEntries = new List();
long removedSize = 0;
// Sort items by expired & priority status
@@ -415,13 +416,13 @@ private void Compact(long removalSizeTarget, Func computeEntry
switch (entry.Priority)
{
case CacheItemPriority.Low:
- lowPriEntries.Add(entry);
+ lowPriEntries.Add(new CompactPriorityEntry(entry, entry.LastAccessed));
break;
case CacheItemPriority.Normal:
- normalPriEntries.Add(entry);
+ normalPriEntries.Add(new CompactPriorityEntry(entry, entry.LastAccessed));
break;
case CacheItemPriority.High:
- highPriEntries.Add(entry);
+ highPriEntries.Add(new CompactPriorityEntry(entry, entry.LastAccessed));
break;
case CacheItemPriority.NeverRemove:
break;
@@ -445,7 +446,7 @@ private void Compact(long removalSizeTarget, Func computeEntry
// ?. Items with the soonest absolute expiration.
// ?. Items with the soonest sliding expiration.
// ?. Larger objects - estimated by object graph size, inaccurate.
- static void ExpirePriorityBucket(ref long removedSize, long removalSizeTarget, Func computeEntrySize, List entriesToRemove, List priorityEntries)
+ static void ExpirePriorityBucket(ref long removedSize, long removalSizeTarget, Func computeEntrySize, List entriesToRemove, List priorityEntries)
{
// Do we meet our quota by just removing expired entries?
if (removalSizeTarget <= removedSize)
@@ -458,9 +459,10 @@ static void ExpirePriorityBucket(ref long removedSize, long removalSizeTarget, F
// TODO: Refine policy
// LRU
- priorityEntries.Sort((e1, e2) => e1.LastAccessed.CompareTo(e2.LastAccessed));
- foreach (CacheEntry entry in priorityEntries)
+ priorityEntries.Sort(static (e1, e2) => e1.LastAccessed.CompareTo(e2.LastAccessed));
+ foreach (CompactPriorityEntry priorityEntry in priorityEntries)
{
+ CacheEntry entry = priorityEntry.Entry;
entry.SetExpired(EvictionReason.Capacity);
entriesToRemove.Add(entry);
removedSize += computeEntrySize(entry);
@@ -473,6 +475,20 @@ static void ExpirePriorityBucket(ref long removedSize, long removalSizeTarget, F
}
}
+ // use a struct instead of a ValueTuple to avoid adding a new dependency
+ // on System.ValueTuple on .NET Framework in a servicing release
+ private readonly struct CompactPriorityEntry
+ {
+ public readonly CacheEntry Entry;
+ public readonly DateTimeOffset LastAccessed;
+
+ public CompactPriorityEntry(CacheEntry entry, DateTimeOffset lastAccessed)
+ {
+ Entry = entry;
+ LastAccessed = lastAccessed;
+ }
+ }
+
public void Dispose()
{
Dispose(true);
diff --git a/src/libraries/Microsoft.Extensions.Caching.Memory/src/Microsoft.Extensions.Caching.Memory.csproj b/src/libraries/Microsoft.Extensions.Caching.Memory/src/Microsoft.Extensions.Caching.Memory.csproj
index 495c645ba993ad..a65eda71abed6a 100644
--- a/src/libraries/Microsoft.Extensions.Caching.Memory/src/Microsoft.Extensions.Caching.Memory.csproj
+++ b/src/libraries/Microsoft.Extensions.Caching.Memory/src/Microsoft.Extensions.Caching.Memory.csproj
@@ -4,6 +4,7 @@
netstandard2.0;net461
true
In-memory cache implementation of Microsoft.Extensions.Caching.Memory.IMemoryCache.
+ 1
diff --git a/src/libraries/Microsoft.Extensions.Caching.Memory/tests/CompactTests.cs b/src/libraries/Microsoft.Extensions.Caching.Memory/tests/CompactTests.cs
index 3d9c2625b19ed9..10b9cce7c4d459 100644
--- a/src/libraries/Microsoft.Extensions.Caching.Memory/tests/CompactTests.cs
+++ b/src/libraries/Microsoft.Extensions.Caching.Memory/tests/CompactTests.cs
@@ -2,6 +2,8 @@
// The .NET Foundation licenses this file to you under the MIT license.
using System;
+using System.Threading;
+using System.Threading.Tasks;
using Microsoft.Extensions.Internal;
using Xunit;
@@ -83,4 +85,60 @@ public void CompactPrioritizesLRU()
Assert.Equal("value4", cache.Get("key4"));
}
}
+
+ [CollectionDefinition(nameof(DisableParallelization), DisableParallelization = true)]
+ public class DisableParallelization { }
+
+ [Collection(nameof(DisableParallelization))]
+ public class CompactTestsDisableParallelization
+ {
+ ///
+ /// Tests a race condition in Compact where CacheEntry.LastAccessed is getting updated
+ /// by a different thread than what is doing the Compact, leading to sorting failing.
+ ///
+ /// See https://github.com/dotnet/runtime/issues/61032.
+ ///
+ [Fact]
+ public void CompactLastAccessedRaceCondition()
+ {
+ const int numEntries = 100;
+ MemoryCache cache = new MemoryCache(new MemoryCacheOptions());
+ Random random = new Random();
+
+ void FillCache()
+ {
+ for (int i = 0; i < numEntries; i++)
+ {
+ cache.Set($"key{i}", $"value{i}");
+ }
+ }
+
+ // start a few tasks to access entries in the background
+ Task[] backgroundAccessTasks = new Task[Environment.ProcessorCount];
+ bool done = false;
+
+ for (int i = 0; i < backgroundAccessTasks.Length; i++)
+ {
+ backgroundAccessTasks[i] = Task.Run(async () =>
+ {
+ while (!done)
+ {
+ cache.TryGetValue($"key{random.Next(numEntries)}", out _);
+ await Task.Yield();
+ }
+ });
+ }
+
+ for (int i = 0; i < 1000; i++)
+ {
+ FillCache();
+
+ cache.Compact(1);
+ }
+
+ done = true;
+
+ Task.WaitAll(backgroundAccessTasks);
+ }
+ }
}
diff --git a/src/libraries/Microsoft.Extensions.Configuration.EnvironmentVariables/src/EnvironmentVariablesConfigurationProvider.cs b/src/libraries/Microsoft.Extensions.Configuration.EnvironmentVariables/src/EnvironmentVariablesConfigurationProvider.cs
index 5ea29116ca2d9b..55f5290cd13da9 100644
--- a/src/libraries/Microsoft.Extensions.Configuration.EnvironmentVariables/src/EnvironmentVariablesConfigurationProvider.cs
+++ b/src/libraries/Microsoft.Extensions.Configuration.EnvironmentVariables/src/EnvironmentVariablesConfigurationProvider.cs
@@ -78,17 +78,9 @@ internal void Load(IDictionary envVariables)
{
prefix = CustomPrefix;
}
- else if (key.StartsWith(_prefix, StringComparison.OrdinalIgnoreCase))
- {
- // This prevents the prefix from being normalized.
- // We can also do a fast path branch, I guess? No point in reallocating if the prefix is empty.
- key = NormalizeKey(key.Substring(_prefix.Length));
- data[key] = entry.Value as string;
-
- continue;
- }
else
{
+ AddIfPrefixed(data, NormalizeKey(key), (string?)entry.Value);
continue;
}
diff --git a/src/libraries/Microsoft.Extensions.Configuration.EnvironmentVariables/src/Microsoft.Extensions.Configuration.EnvironmentVariables.csproj b/src/libraries/Microsoft.Extensions.Configuration.EnvironmentVariables/src/Microsoft.Extensions.Configuration.EnvironmentVariables.csproj
index c12fa852d9b768..8983f7795cb97f 100644
--- a/src/libraries/Microsoft.Extensions.Configuration.EnvironmentVariables/src/Microsoft.Extensions.Configuration.EnvironmentVariables.csproj
+++ b/src/libraries/Microsoft.Extensions.Configuration.EnvironmentVariables/src/Microsoft.Extensions.Configuration.EnvironmentVariables.csproj
@@ -4,6 +4,7 @@
netstandard2.0;net461
true
Environment variables configuration provider implementation for Microsoft.Extensions.Configuration.
+ 1
diff --git a/src/libraries/Microsoft.Extensions.Configuration.EnvironmentVariables/tests/EnvironmentVariablesTest.cs b/src/libraries/Microsoft.Extensions.Configuration.EnvironmentVariables/tests/EnvironmentVariablesTest.cs
index c5b1030ee74a0b..1e98a5767096a0 100644
--- a/src/libraries/Microsoft.Extensions.Configuration.EnvironmentVariables/tests/EnvironmentVariablesTest.cs
+++ b/src/libraries/Microsoft.Extensions.Configuration.EnvironmentVariables/tests/EnvironmentVariablesTest.cs
@@ -166,7 +166,7 @@ public void ReplaceDoubleUnderscoreInEnvironmentVariablesButNotPrefix()
envConfigSrc.Load(dict);
- Assert.Equal("connection", envConfigSrc.Get("data:ConnectionString"));
+ Assert.Throws(() => envConfigSrc.Get("data:ConnectionString"));
}
[Fact]
@@ -176,7 +176,7 @@ public void ReplaceDoubleUnderscoreInEnvironmentVariablesButNotInAnomalousPrefix
{
{"_____EXPERIMENTAL__data__ConnectionString", "connection"}
};
- var envConfigSrc = new EnvironmentVariablesConfigurationProvider("_____EXPERIMENTAL__");
+ var envConfigSrc = new EnvironmentVariablesConfigurationProvider("::_EXPERIMENTAL:");
envConfigSrc.Load(dict);
@@ -194,7 +194,7 @@ public void ReplaceDoubleUnderscoreInEnvironmentVariablesWithDuplicatedPrefix()
envConfigSrc.Load(dict);
- Assert.Equal("connection", envConfigSrc.Get("test:ConnectionString"));
+ Assert.Throws(() => envConfigSrc.Get("test:ConnectionString"));
}
[Fact]
@@ -205,7 +205,7 @@ public void PrefixPreventsLoadingSqlConnectionStrings()
{"test__test__ConnectionString", "connection"},
{"SQLCONNSTR_db1", "connStr"}
};
- var envConfigSrc = new EnvironmentVariablesConfigurationProvider("test__");
+ var envConfigSrc = new EnvironmentVariablesConfigurationProvider("test:");
envConfigSrc.Load(dict);
@@ -213,6 +213,54 @@ public void PrefixPreventsLoadingSqlConnectionStrings()
Assert.Throws(() => envConfigSrc.Get("ConnectionStrings:db1_ProviderName"));
}
+ public const string EnvironmentVariable = "Microsoft__Extensions__Configuration__EnvironmentVariables__Test__Foo";
+ public class SettingsWithFoo
+ {
+ public string? Foo { get; set; }
+ }
+
+ [Fact]
+ public void AddEnvironmentVariables_Bind_PrefixShouldNormalize()
+ {
+ try
+ {
+ Environment.SetEnvironmentVariable(EnvironmentVariable, "myFooValue");
+ var configuration = new ConfigurationBuilder()
+ .AddEnvironmentVariables("Microsoft:Extensions:Configuration:EnvironmentVariables:Test:")
+ .Build();
+
+ var settingsWithFoo = new SettingsWithFoo();
+ configuration.Bind(settingsWithFoo);
+
+ Assert.Equal("myFooValue", settingsWithFoo.Foo);
+ }
+ finally
+ {
+ Environment.SetEnvironmentVariable(EnvironmentVariable, null);
+ }
+ }
+
+ [Fact]
+ public void AddEnvironmentVariables_UsingDoubleUnderscores_Bind_PrefixWontNormalize()
+ {
+ try
+ {
+ Environment.SetEnvironmentVariable(EnvironmentVariable, "myFooValue");
+ var configuration = new ConfigurationBuilder()
+ .AddEnvironmentVariables("Microsoft__Extensions__Configuration__EnvironmentVariables__Test__")
+ .Build();
+
+ var settingsWithFoo = new SettingsWithFoo();
+ configuration.Bind(settingsWithFoo);
+
+ Assert.Null(settingsWithFoo.Foo);
+ }
+ finally
+ {
+ Environment.SetEnvironmentVariable(EnvironmentVariable, null);
+ }
+ }
+
[ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsThreadingSupported))]
public void BindingDoesNotThrowIfReloadedDuringBinding()
{
diff --git a/src/libraries/Microsoft.Extensions.Configuration.Json/Microsoft.Extensions.Configuration.Json.sln b/src/libraries/Microsoft.Extensions.Configuration.Json/Microsoft.Extensions.Configuration.Json.sln
index 648fd67ef942e7..e7d5ca9c205118 100644
--- a/src/libraries/Microsoft.Extensions.Configuration.Json/Microsoft.Extensions.Configuration.Json.sln
+++ b/src/libraries/Microsoft.Extensions.Configuration.Json/Microsoft.Extensions.Configuration.Json.sln
@@ -49,8 +49,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServ
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Encodings.Web", "..\System.Text.Encodings.Web\src\System.Text.Encodings.Web.csproj", "{BD19B1E7-CAFF-4009-874A-760D5A466E28}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Json.SourceGeneration", "..\System.Text.Json\gen\System.Text.Json.SourceGeneration.csproj", "{160C3D6B-D90A-40B1-A695-81DB79EB24C4}"
-EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Json", "..\System.Text.Json\src\System.Text.Json.csproj", "{A49023C8-173A-4B8F-84B3-2FF37FE8344A}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{1F57E720-CBFF-4648-A507-EFCBCECB5FD3}"
@@ -141,10 +139,6 @@ Global
{BD19B1E7-CAFF-4009-874A-760D5A466E28}.Debug|Any CPU.Build.0 = Debug|Any CPU
{BD19B1E7-CAFF-4009-874A-760D5A466E28}.Release|Any CPU.ActiveCfg = Release|Any CPU
{BD19B1E7-CAFF-4009-874A-760D5A466E28}.Release|Any CPU.Build.0 = Release|Any CPU
- {160C3D6B-D90A-40B1-A695-81DB79EB24C4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {160C3D6B-D90A-40B1-A695-81DB79EB24C4}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {160C3D6B-D90A-40B1-A695-81DB79EB24C4}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {160C3D6B-D90A-40B1-A695-81DB79EB24C4}.Release|Any CPU.Build.0 = Release|Any CPU
{7517D0A0-5596-48B7-96EF-CB24DAD72675}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{7517D0A0-5596-48B7-96EF-CB24DAD72675}.Debug|Any CPU.Build.0 = Debug|Any CPU
{7517D0A0-5596-48B7-96EF-CB24DAD72675}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -201,7 +195,6 @@ Global
{6A80D098-69EC-45FE-A064-4CBDFA44BA43} = {1789A282-9C08-40AB-9FD0-0FB1FAB99621}
{B1723D4C-15E3-4A39-8976-C3E1740E5F00} = {1789A282-9C08-40AB-9FD0-0FB1FAB99621}
{BD19B1E7-CAFF-4009-874A-760D5A466E28} = {1789A282-9C08-40AB-9FD0-0FB1FAB99621}
- {160C3D6B-D90A-40B1-A695-81DB79EB24C4} = {1789A282-9C08-40AB-9FD0-0FB1FAB99621}
{7517D0A0-5596-48B7-96EF-CB24DAD72675} = {1789A282-9C08-40AB-9FD0-0FB1FAB99621}
{68210977-E10C-4BC3-B235-31B6E2AF9830} = {1789A282-9C08-40AB-9FD0-0FB1FAB99621}
{FE50757B-7862-49D2-812E-1646F6FE0070} = {1789A282-9C08-40AB-9FD0-0FB1FAB99621}
diff --git a/src/libraries/Microsoft.Extensions.Configuration.UserSecrets/Microsoft.Extensions.Configuration.UserSecrets.sln b/src/libraries/Microsoft.Extensions.Configuration.UserSecrets/Microsoft.Extensions.Configuration.UserSecrets.sln
index e13f9f1bb81357..6e0e8ac58fc456 100644
--- a/src/libraries/Microsoft.Extensions.Configuration.UserSecrets/Microsoft.Extensions.Configuration.UserSecrets.sln
+++ b/src/libraries/Microsoft.Extensions.Configuration.UserSecrets/Microsoft.Extensions.Configuration.UserSecrets.sln
@@ -49,8 +49,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServ
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Encodings.Web", "..\System.Text.Encodings.Web\src\System.Text.Encodings.Web.csproj", "{1555B38A-E9CB-4734-AAB1-59CFB833A06D}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Json.SourceGeneration", "..\System.Text.Json\gen\System.Text.Json.SourceGeneration.csproj", "{30EBBE93-80FC-442D-ADC6-D0BB0A8CFA76}"
-EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Json", "..\System.Text.Json\src\System.Text.Json.csproj", "{82700778-D9AD-4B9D-8A1C-CDC1A19E4D54}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{2434A707-1012-4104-81A0-1A1B25D9FEEA}"
@@ -161,10 +159,6 @@ Global
{1555B38A-E9CB-4734-AAB1-59CFB833A06D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1555B38A-E9CB-4734-AAB1-59CFB833A06D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{1555B38A-E9CB-4734-AAB1-59CFB833A06D}.Release|Any CPU.Build.0 = Release|Any CPU
- {30EBBE93-80FC-442D-ADC6-D0BB0A8CFA76}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {30EBBE93-80FC-442D-ADC6-D0BB0A8CFA76}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {30EBBE93-80FC-442D-ADC6-D0BB0A8CFA76}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {30EBBE93-80FC-442D-ADC6-D0BB0A8CFA76}.Release|Any CPU.Build.0 = Release|Any CPU
{96003091-9E9D-42D5-85A6-C2DFBD9DD847}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{96003091-9E9D-42D5-85A6-C2DFBD9DD847}.Debug|Any CPU.Build.0 = Debug|Any CPU
{96003091-9E9D-42D5-85A6-C2DFBD9DD847}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -203,7 +197,6 @@ Global
{82700778-D9AD-4B9D-8A1C-CDC1A19E4D54} = {B5EF5DDD-EB92-414C-B9D2-826BA6CECCBF}
{1EF04395-4D84-43F1-BD99-7F6D6C3D70BB} = {B5EF5DDD-EB92-414C-B9D2-826BA6CECCBF}
{1555B38A-E9CB-4734-AAB1-59CFB833A06D} = {B5EF5DDD-EB92-414C-B9D2-826BA6CECCBF}
- {30EBBE93-80FC-442D-ADC6-D0BB0A8CFA76} = {B5EF5DDD-EB92-414C-B9D2-826BA6CECCBF}
{54B89407-FCD9-4B1A-8F83-04585D437443} = {B5EF5DDD-EB92-414C-B9D2-826BA6CECCBF}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
diff --git a/src/libraries/Microsoft.Extensions.Configuration.UserSecrets/src/Microsoft.Extensions.Configuration.UserSecrets.csproj b/src/libraries/Microsoft.Extensions.Configuration.UserSecrets/src/Microsoft.Extensions.Configuration.UserSecrets.csproj
index d488eecf483e74..a029a8c863902f 100644
--- a/src/libraries/Microsoft.Extensions.Configuration.UserSecrets/src/Microsoft.Extensions.Configuration.UserSecrets.csproj
+++ b/src/libraries/Microsoft.Extensions.Configuration.UserSecrets/src/Microsoft.Extensions.Configuration.UserSecrets.csproj
@@ -4,6 +4,7 @@
netstandard2.0;net461
true
User secrets configuration provider implementation for Microsoft.Extensions.Configuration.
+ 1
@@ -14,8 +15,8 @@
-
-
+
+
diff --git a/src/libraries/Microsoft.Extensions.Configuration.UserSecrets/src/UserSecretsConfigurationExtensions.cs b/src/libraries/Microsoft.Extensions.Configuration.UserSecrets/src/UserSecretsConfigurationExtensions.cs
index 86139faf9b021d..963ac77a30eea6 100644
--- a/src/libraries/Microsoft.Extensions.Configuration.UserSecrets/src/UserSecretsConfigurationExtensions.cs
+++ b/src/libraries/Microsoft.Extensions.Configuration.UserSecrets/src/UserSecretsConfigurationExtensions.cs
@@ -29,7 +29,7 @@ public static class UserSecretsConfigurationExtensions
/// The configuration builder.
public static IConfigurationBuilder AddUserSecrets(this IConfigurationBuilder configuration)
where T : class
- => configuration.AddUserSecrets(typeof(T).Assembly, optional: false, reloadOnChange: false);
+ => configuration.AddUserSecrets(typeof(T).Assembly, optional: true, reloadOnChange: false);
///
///
@@ -82,7 +82,7 @@ public static IConfigurationBuilder AddUserSecrets(this IConfigurationBuilder
/// Thrown when does not have a valid
/// The configuration builder.
public static IConfigurationBuilder AddUserSecrets(this IConfigurationBuilder configuration, Assembly assembly)
- => configuration.AddUserSecrets(assembly, optional: false, reloadOnChange: false);
+ => configuration.AddUserSecrets(assembly, optional: true, reloadOnChange: false);
///
///
diff --git a/src/libraries/Microsoft.Extensions.Configuration.UserSecrets/src/build/netstandard2.0/Microsoft.Extensions.Configuration.UserSecrets.props b/src/libraries/Microsoft.Extensions.Configuration.UserSecrets/src/buildTransitive/netstandard2.0/Microsoft.Extensions.Configuration.UserSecrets.props
similarity index 100%
rename from src/libraries/Microsoft.Extensions.Configuration.UserSecrets/src/build/netstandard2.0/Microsoft.Extensions.Configuration.UserSecrets.props
rename to src/libraries/Microsoft.Extensions.Configuration.UserSecrets/src/buildTransitive/netstandard2.0/Microsoft.Extensions.Configuration.UserSecrets.props
diff --git a/src/libraries/Microsoft.Extensions.Configuration.UserSecrets/src/build/netstandard2.0/Microsoft.Extensions.Configuration.UserSecrets.targets b/src/libraries/Microsoft.Extensions.Configuration.UserSecrets/src/buildTransitive/netstandard2.0/Microsoft.Extensions.Configuration.UserSecrets.targets
similarity index 100%
rename from src/libraries/Microsoft.Extensions.Configuration.UserSecrets/src/build/netstandard2.0/Microsoft.Extensions.Configuration.UserSecrets.targets
rename to src/libraries/Microsoft.Extensions.Configuration.UserSecrets/src/buildTransitive/netstandard2.0/Microsoft.Extensions.Configuration.UserSecrets.targets
diff --git a/src/libraries/Microsoft.Extensions.Configuration.UserSecrets/tests/ConfigurationExtensionTest.cs b/src/libraries/Microsoft.Extensions.Configuration.UserSecrets/tests/ConfigurationExtensionTest.cs
index 03667ab17b33c5..53dde10c61df4a 100644
--- a/src/libraries/Microsoft.Extensions.Configuration.UserSecrets/tests/ConfigurationExtensionTest.cs
+++ b/src/libraries/Microsoft.Extensions.Configuration.UserSecrets/tests/ConfigurationExtensionTest.cs
@@ -85,23 +85,23 @@ public void AddUserSecrets_FindsAssemblyAttributeFromType()
public void AddUserSecrets_ThrowsIfAssemblyAttributeFromType()
{
var ex = Assert.Throws(() =>
- new ConfigurationBuilder().AddUserSecrets());
+ new ConfigurationBuilder().AddUserSecrets(optional: false));
Assert.Equal(SR.Format(SR.Error_Missing_UserSecretsIdAttribute, typeof(string).Assembly.GetName().Name),
ex.Message);
ex = Assert.Throws(() =>
- new ConfigurationBuilder().AddUserSecrets(typeof(JObject).Assembly));
+ new ConfigurationBuilder().AddUserSecrets(typeof(JObject).Assembly, optional: false));
Assert.Equal(SR.Format(SR.Error_Missing_UserSecretsIdAttribute, typeof(JObject).Assembly.GetName().Name),
ex.Message);
}
[Fact]
- public void AddUserSecrets_DoesNotThrowsIfOptional()
+ public void AddUserSecrets_DoesNotThrowsIfOptionalByDefault()
{
var config = new ConfigurationBuilder()
- .AddUserSecrets(optional: true)
- .AddUserSecrets(typeof(List<>).Assembly, optional: true)
+ .AddUserSecrets()
+ .AddUserSecrets(typeof(List<>).Assembly)
.Build();
Assert.Empty(config.AsEnumerable());
diff --git a/src/libraries/Microsoft.Extensions.Configuration.Xml/src/Microsoft.Extensions.Configuration.Xml.csproj b/src/libraries/Microsoft.Extensions.Configuration.Xml/src/Microsoft.Extensions.Configuration.Xml.csproj
index c9c66f5c8c67f2..9a06f8e7ad52b3 100644
--- a/src/libraries/Microsoft.Extensions.Configuration.Xml/src/Microsoft.Extensions.Configuration.Xml.csproj
+++ b/src/libraries/Microsoft.Extensions.Configuration.Xml/src/Microsoft.Extensions.Configuration.Xml.csproj
@@ -1,7 +1,7 @@
- netstandard2.0;net461
+ netstandard2.0;net461-windows
true
XML configuration provider implementation for Microsoft.Extensions.Configuration.
diff --git a/src/libraries/Microsoft.Extensions.Configuration.Xml/tests/Microsoft.Extensions.Configuration.Xml.Tests.csproj b/src/libraries/Microsoft.Extensions.Configuration.Xml/tests/Microsoft.Extensions.Configuration.Xml.Tests.csproj
index 85e8e1de25876a..35ceadc08eed45 100644
--- a/src/libraries/Microsoft.Extensions.Configuration.Xml/tests/Microsoft.Extensions.Configuration.Xml.Tests.csproj
+++ b/src/libraries/Microsoft.Extensions.Configuration.Xml/tests/Microsoft.Extensions.Configuration.Xml.Tests.csproj
@@ -1,7 +1,7 @@
- $(NetCoreAppCurrent);net461
+ $(NetCoreAppCurrent);net461-windows
true
diff --git a/src/libraries/Microsoft.Extensions.Configuration/Microsoft.Extensions.Configuration.sln b/src/libraries/Microsoft.Extensions.Configuration/Microsoft.Extensions.Configuration.sln
index a2ec3b0599f575..57cf3b372163b0 100644
--- a/src/libraries/Microsoft.Extensions.Configuration/Microsoft.Extensions.Configuration.sln
+++ b/src/libraries/Microsoft.Extensions.Configuration/Microsoft.Extensions.Configuration.sln
@@ -95,8 +95,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Permissions
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Encodings.Web", "..\System.Text.Encodings.Web\src\System.Text.Encodings.Web.csproj", "{23F4102D-67BD-4865-BB19-195C47945733}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Json.SourceGeneration", "..\System.Text.Json\gen\System.Text.Json.SourceGeneration.csproj", "{634542E9-CF9A-4BD2-BC36-71D12BEF2B36}"
-EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Json", "..\System.Text.Json\src\System.Text.Json.csproj", "{41234DB5-1F3A-4E4A-8BD9-4A277C249666}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Windows.Extensions", "..\System.Windows.Extensions\ref\System.Windows.Extensions.csproj", "{6CDFD705-28EC-4D58-A2F9-715A3B06661B}"
@@ -251,10 +249,6 @@ Global
{23F4102D-67BD-4865-BB19-195C47945733}.Debug|Any CPU.Build.0 = Debug|Any CPU
{23F4102D-67BD-4865-BB19-195C47945733}.Release|Any CPU.ActiveCfg = Release|Any CPU
{23F4102D-67BD-4865-BB19-195C47945733}.Release|Any CPU.Build.0 = Release|Any CPU
- {634542E9-CF9A-4BD2-BC36-71D12BEF2B36}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {634542E9-CF9A-4BD2-BC36-71D12BEF2B36}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {634542E9-CF9A-4BD2-BC36-71D12BEF2B36}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {634542E9-CF9A-4BD2-BC36-71D12BEF2B36}.Release|Any CPU.Build.0 = Release|Any CPU
{CDC60461-56B7-4941-AD08-90228BD450CE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{CDC60461-56B7-4941-AD08-90228BD450CE}.Debug|Any CPU.Build.0 = Debug|Any CPU
{CDC60461-56B7-4941-AD08-90228BD450CE}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -303,7 +297,7 @@ Global
{7CFEB13D-63D5-42A7-868C-CE1D0049EAF0}.Debug|Any CPU.Build.0 = Debug|Any CPU
{7CFEB13D-63D5-42A7-868C-CE1D0049EAF0}.Release|Any CPU.ActiveCfg = Release|Any CPU
{7CFEB13D-63D5-42A7-868C-CE1D0049EAF0}.Release|Any CPU.Build.0 = Release|Any CPU
- {6CDFD705-28EC-4D58-A2F9-715A3B06661B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {6CDFD705-28EC-4D58-A2F9-715A3B06661B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{6CDFD705-28EC-4D58-A2F9-715A3B06661B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{6CDFD705-28EC-4D58-A2F9-715A3B06661B}.Release|Any CPU.ActiveCfg = Release|Any CPU
{6CDFD705-28EC-4D58-A2F9-715A3B06661B}.Release|Any CPU.Build.0 = Release|Any CPU
@@ -370,7 +364,6 @@ Global
{BAA953EF-6529-4F2C-8F89-C76A05258677} = {76107BEB-02C0-4A83-9631-B226340752A7}
{42C10152-F747-443F-9AC1-5738CB62EA6C} = {76107BEB-02C0-4A83-9631-B226340752A7}
{23F4102D-67BD-4865-BB19-195C47945733} = {76107BEB-02C0-4A83-9631-B226340752A7}
- {634542E9-CF9A-4BD2-BC36-71D12BEF2B36} = {76107BEB-02C0-4A83-9631-B226340752A7}
{CDC60461-56B7-4941-AD08-90228BD450CE} = {76107BEB-02C0-4A83-9631-B226340752A7}
{6CCBE9AB-E620-4616-9B80-1F9D3E722B87} = {76107BEB-02C0-4A83-9631-B226340752A7}
{8F65DFBB-9196-4E69-879A-C99C641B3E49} = {76107BEB-02C0-4A83-9631-B226340752A7}
diff --git a/src/libraries/Microsoft.Extensions.Configuration/src/ConfigurationManager.cs b/src/libraries/Microsoft.Extensions.Configuration/src/ConfigurationManager.cs
index 9578f3c334ac3f..84cceb06218d74 100644
--- a/src/libraries/Microsoft.Extensions.Configuration/src/ConfigurationManager.cs
+++ b/src/libraries/Microsoft.Extensions.Configuration/src/ConfigurationManager.cs
@@ -12,15 +12,20 @@ namespace Microsoft.Extensions.Configuration
{
///
/// Configuration is mutable configuration object. It is both an and an .
- /// As sources are added, it updates its current view of configuration. Once Build is called, configuration is frozen.
+ /// As sources are added, it updates its current view of configuration.
///
public sealed class ConfigurationManager : IConfigurationBuilder, IConfigurationRoot, IDisposable
{
+ // Concurrently modifying config sources or properties is not thread-safe. However, it is thread-safe to read config while modifying sources or properties.
private readonly ConfigurationSources _sources;
private readonly ConfigurationBuilderProperties _properties;
- private readonly object _providerLock = new();
- private readonly List _providers = new();
+ // ReferenceCountedProviderManager manages copy-on-write references to support concurrently reading config while modifying sources.
+ // It waits for readers to unreference the providers before disposing them without blocking on any concurrent operations.
+ private readonly ReferenceCountedProviderManager _providerManager = new();
+
+ // _changeTokenRegistrations is only modified when config sources are modified. It is not referenced by any read operations.
+ // Because modify config sources is not thread-safe, modifying _changeTokenRegistrations does not need to be thread-safe either.
private readonly List _changeTokenRegistrations = new();
private ConfigurationReloadToken _changeToken = new();
@@ -43,17 +48,13 @@ public string this[string key]
{
get
{
- lock (_providerLock)
- {
- return ConfigurationRoot.GetConfiguration(_providers, key);
- }
+ using ReferenceCountedProviders reference = _providerManager.GetReference();
+ return ConfigurationRoot.GetConfiguration(reference.Providers, key);
}
set
{
- lock (_providerLock)
- {
- ConfigurationRoot.SetConfiguration(_providers, key, value);
- }
+ using ReferenceCountedProviders reference = _providerManager.GetReference();
+ ConfigurationRoot.SetConfiguration(reference.Providers, key, value);
}
}
@@ -61,37 +62,22 @@ public string this[string key]
public IConfigurationSection GetSection(string key) => new ConfigurationSection(this, key);
///
- public IEnumerable GetChildren()
- {
- lock (_providerLock)
- {
- // ToList() to eagerly evaluate inside lock.
- return this.GetChildrenImplementation(null).ToList();
- }
- }
+ public IEnumerable GetChildren() => this.GetChildrenImplementation(null);
IDictionary IConfigurationBuilder.Properties => _properties;
IList IConfigurationBuilder.Sources => _sources;
- IEnumerable IConfigurationRoot.Providers
- {
- get
- {
- lock (_providerLock)
- {
- return new List(_providers);
- }
- }
- }
+ // We cannot track the duration of the reference to the providers if this property is used.
+ // If a configuration source is removed after this is accessed but before it's completely enumerated,
+ // this may allow access to a disposed provider.
+ IEnumerable IConfigurationRoot.Providers => _providerManager.NonReferenceCountedProviders;
///
public void Dispose()
{
- lock (_providerLock)
- {
- DisposeRegistrationsAndProvidersUnsynchronized();
- }
+ DisposeRegistrations();
+ _providerManager.Dispose();
}
IConfigurationBuilder IConfigurationBuilder.Add(IConfigurationSource source)
@@ -106,9 +92,9 @@ IConfigurationBuilder IConfigurationBuilder.Add(IConfigurationSource source)
void IConfigurationRoot.Reload()
{
- lock (_providerLock)
+ using (ReferenceCountedProviders reference = _providerManager.GetReference())
{
- foreach (var provider in _providers)
+ foreach (IConfigurationProvider provider in reference.Providers)
{
provider.Load();
}
@@ -117,6 +103,8 @@ void IConfigurationRoot.Reload()
RaiseChanged();
}
+ internal ReferenceCountedProviders GetProvidersReference() => _providerManager.GetReference();
+
private void RaiseChanged()
{
var previousToken = Interlocked.Exchange(ref _changeToken, new ConfigurationReloadToken());
@@ -126,59 +114,49 @@ private void RaiseChanged()
// Don't rebuild and reload all providers in the common case when a source is simply added to the IList.
private void AddSource(IConfigurationSource source)
{
- lock (_providerLock)
- {
- var provider = source.Build(this);
- _providers.Add(provider);
+ IConfigurationProvider provider = source.Build(this);
- provider.Load();
- _changeTokenRegistrations.Add(ChangeToken.OnChange(() => provider.GetReloadToken(), () => RaiseChanged()));
- }
+ provider.Load();
+ _changeTokenRegistrations.Add(ChangeToken.OnChange(() => provider.GetReloadToken(), () => RaiseChanged()));
+ _providerManager.AddProvider(provider);
RaiseChanged();
}
// Something other than Add was called on IConfigurationBuilder.Sources or IConfigurationBuilder.Properties has changed.
private void ReloadSources()
{
- lock (_providerLock)
- {
- DisposeRegistrationsAndProvidersUnsynchronized();
+ DisposeRegistrations();
- _changeTokenRegistrations.Clear();
- _providers.Clear();
+ _changeTokenRegistrations.Clear();
- foreach (var source in _sources)
- {
- _providers.Add(source.Build(this));
- }
+ var newProvidersList = new List();
- foreach (var p in _providers)
- {
- p.Load();
- _changeTokenRegistrations.Add(ChangeToken.OnChange(() => p.GetReloadToken(), () => RaiseChanged()));
- }
+ foreach (IConfigurationSource source in _sources)
+ {
+ newProvidersList.Add(source.Build(this));
+ }
+
+ foreach (IConfigurationProvider p in newProvidersList)
+ {
+ p.Load();
+ _changeTokenRegistrations.Add(ChangeToken.OnChange(() => p.GetReloadToken(), () => RaiseChanged()));
}
+ _providerManager.ReplaceProviders(newProvidersList);
RaiseChanged();
}
- private void DisposeRegistrationsAndProvidersUnsynchronized()
+ private void DisposeRegistrations()
{
// dispose change token registrations
- foreach (var registration in _changeTokenRegistrations)
+ foreach (IDisposable registration in _changeTokenRegistrations)
{
registration.Dispose();
}
-
- // dispose providers
- foreach (var provider in _providers)
- {
- (provider as IDisposable)?.Dispose();
- }
}
- private class ConfigurationSources : IList
+ private sealed class ConfigurationSources : IList
{
private readonly List _sources = new();
private readonly ConfigurationManager _config;
@@ -259,7 +237,7 @@ IEnumerator IEnumerable.GetEnumerator()
}
}
- private class ConfigurationBuilderProperties : IDictionary
+ private sealed class ConfigurationBuilderProperties : IDictionary
{
private readonly Dictionary _properties = new();
private readonly ConfigurationManager _config;
diff --git a/src/libraries/Microsoft.Extensions.Configuration/src/InternalConfigurationRootExtensions.cs b/src/libraries/Microsoft.Extensions.Configuration/src/InternalConfigurationRootExtensions.cs
index bff5c527104008..de86a8473d9812 100644
--- a/src/libraries/Microsoft.Extensions.Configuration/src/InternalConfigurationRootExtensions.cs
+++ b/src/libraries/Microsoft.Extensions.Configuration/src/InternalConfigurationRootExtensions.cs
@@ -20,11 +20,24 @@ internal static class InternalConfigurationRootExtensions
/// Immediate children sub-sections of section specified by key.
internal static IEnumerable GetChildrenImplementation(this IConfigurationRoot root, string path)
{
- return root.Providers
+ using ReferenceCountedProviders? reference = (root as ConfigurationManager)?.GetProvidersReference();
+ IEnumerable providers = reference?.Providers ?? root.Providers;
+
+ IEnumerable children = providers
.Aggregate(Enumerable.Empty(),
(seed, source) => source.GetChildKeys(seed, path))
.Distinct(StringComparer.OrdinalIgnoreCase)
.Select(key => root.GetSection(path == null ? key : ConfigurationPath.Combine(path, key)));
+
+ if (reference is null)
+ {
+ return children;
+ }
+ else
+ {
+ // Eagerly evaluate the IEnumerable before releasing the reference so we don't allow iteration over disposed providers.
+ return children.ToList();
+ }
}
}
}
diff --git a/src/libraries/Microsoft.Extensions.Configuration/src/Microsoft.Extensions.Configuration.csproj b/src/libraries/Microsoft.Extensions.Configuration/src/Microsoft.Extensions.Configuration.csproj
index 62243f8db8537a..89d1b42bcfaa91 100644
--- a/src/libraries/Microsoft.Extensions.Configuration/src/Microsoft.Extensions.Configuration.csproj
+++ b/src/libraries/Microsoft.Extensions.Configuration/src/Microsoft.Extensions.Configuration.csproj
@@ -4,6 +4,8 @@
netstandard2.0;net461
true
Implementation of key-value pair based configuration for Microsoft.Extensions.Configuration. Includes the memory configuration provider.
+ 1
+ true
diff --git a/src/libraries/Microsoft.Extensions.Configuration/src/ReferenceCountedProviders.cs b/src/libraries/Microsoft.Extensions.Configuration/src/ReferenceCountedProviders.cs
new file mode 100644
index 00000000000000..2c2e32fc7e47d0
--- /dev/null
+++ b/src/libraries/Microsoft.Extensions.Configuration/src/ReferenceCountedProviders.cs
@@ -0,0 +1,93 @@
+// 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 System.Diagnostics;
+using System.Threading;
+
+namespace Microsoft.Extensions.Configuration
+{
+ // ReferenceCountedProviders is used by ConfigurationManager to wait until all readers unreference it before disposing any providers.
+ internal abstract class ReferenceCountedProviders : IDisposable
+ {
+ public static ReferenceCountedProviders Create(List providers) => new ActiveReferenceCountedProviders(providers);
+
+ // If anything references DisposedReferenceCountedProviders, it indicates something is using the ConfigurationManager after it's been disposed.
+ // We could preemptively throw an ODE from ReferenceCountedProviderManager.GetReference() instead of returning this type, but this might
+ // break existing apps that are previously able to continue to read configuration after disposing an ConfigurationManager.
+ public static ReferenceCountedProviders CreateDisposed(List providers) => new DisposedReferenceCountedProviders(providers);
+
+ public abstract List Providers { get; set; }
+
+ // NonReferenceCountedProviders is only used to:
+ // 1. Support IConfigurationRoot.Providers because we cannot track the lifetime of that reference.
+ // 2. Construct DisposedReferenceCountedProviders because the providers are disposed anyway and no longer reference counted.
+ public abstract List NonReferenceCountedProviders { get; }
+
+ public abstract void AddReference();
+ // This is Dispose() rather than RemoveReference() so we can conveniently release a reference at the end of a using block.
+ public abstract void Dispose();
+
+ private sealed class ActiveReferenceCountedProviders : ReferenceCountedProviders
+ {
+ private long _refCount = 1;
+ // volatile is not strictly necessary because the runtime adds a barrier either way, but volatile indicates that this field has
+ // unsynchronized readers meaning the all writes initializing the list must be published before updating the _providers reference.
+ private volatile List _providers;
+
+ public ActiveReferenceCountedProviders(List providers)
+ {
+ _providers = providers;
+ }
+
+ public override List Providers
+ {
+ get
+ {
+ Debug.Assert(_refCount > 0);
+ return _providers;
+ }
+ set
+ {
+ Debug.Assert(_refCount > 0);
+ _providers = value;
+ }
+ }
+
+ public override List NonReferenceCountedProviders => _providers;
+
+ public override void AddReference()
+ {
+ // AddReference() is always called with a lock to ensure _refCount hasn't already decremented to zero.
+ Debug.Assert(_refCount > 0);
+ Interlocked.Increment(ref _refCount);
+ }
+
+ public override void Dispose()
+ {
+ if (Interlocked.Decrement(ref _refCount) == 0)
+ {
+ foreach (IConfigurationProvider provider in _providers)
+ {
+ (provider as IDisposable)?.Dispose();
+ }
+ }
+ }
+ }
+
+ private sealed class DisposedReferenceCountedProviders : ReferenceCountedProviders
+ {
+ public DisposedReferenceCountedProviders(List providers)
+ {
+ Providers = providers;
+ }
+
+ public override List Providers { get; set; }
+ public override List NonReferenceCountedProviders => Providers;
+
+ public override void AddReference() { }
+ public override void Dispose() { }
+ }
+ }
+}
diff --git a/src/libraries/Microsoft.Extensions.Configuration/src/ReferenceCountedProvidersManager.cs b/src/libraries/Microsoft.Extensions.Configuration/src/ReferenceCountedProvidersManager.cs
new file mode 100644
index 00000000000000..210e41f665a47a
--- /dev/null
+++ b/src/libraries/Microsoft.Extensions.Configuration/src/ReferenceCountedProvidersManager.cs
@@ -0,0 +1,93 @@
+// 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;
+
+namespace Microsoft.Extensions.Configuration
+{
+ // ReferenceCountedProviderManager is used by ConfigurationManager to provide copy-on-write references that support concurrently
+ // reading config while modifying sources. It waits for readers to unreference the providers before disposing them
+ // without blocking on any concurrent operations.
+ internal sealed class ReferenceCountedProviderManager : IDisposable
+ {
+ private readonly object _replaceProvidersLock = new object();
+ private ReferenceCountedProviders _refCountedProviders = ReferenceCountedProviders.Create(new List());
+ private bool _disposed;
+
+ // This is only used to support IConfigurationRoot.Providers because we cannot track the lifetime of that reference.
+ public IEnumerable NonReferenceCountedProviders => _refCountedProviders.NonReferenceCountedProviders;
+
+ public ReferenceCountedProviders GetReference()
+ {
+ // Lock to ensure oldRefCountedProviders.Dispose() in ReplaceProviders() or Dispose() doesn't decrement ref count to zero
+ // before calling _refCountedProviders.AddReference().
+ lock (_replaceProvidersLock)
+ {
+ if (_disposed)
+ {
+ // Return a non-reference-counting ReferenceCountedProviders instance now that the ConfigurationManager is disposed.
+ // We could preemptively throw an ODE instead, but this might break existing apps that were previously able to
+ // continue to read configuration after disposing an ConfigurationManager.
+ return ReferenceCountedProviders.CreateDisposed(_refCountedProviders.NonReferenceCountedProviders);
+ }
+
+ _refCountedProviders.AddReference();
+ return _refCountedProviders;
+ }
+ }
+
+ // Providers should never be concurrently modified. Reading during modification is allowed.
+ public void ReplaceProviders(List providers)
+ {
+ ReferenceCountedProviders oldRefCountedProviders = _refCountedProviders;
+
+ lock (_replaceProvidersLock)
+ {
+ if (_disposed)
+ {
+ throw new ObjectDisposedException(nameof(ConfigurationManager));
+ }
+
+ _refCountedProviders = ReferenceCountedProviders.Create(providers);
+ }
+
+ // Decrement the reference count to the old providers. If they are being concurrently read from
+ // the actual disposal of the old providers will be delayed until the final reference is released.
+ // Never dispose ReferenceCountedProviders with a lock because this may call into user code.
+ oldRefCountedProviders.Dispose();
+ }
+
+ public void AddProvider(IConfigurationProvider provider)
+ {
+ lock (_replaceProvidersLock)
+ {
+ if (_disposed)
+ {
+ throw new ObjectDisposedException(nameof(ConfigurationManager));
+ }
+
+ // Maintain existing references, but replace list with copy containing new item.
+ _refCountedProviders.Providers = new List(_refCountedProviders.Providers)
+ {
+ provider
+ };
+ }
+ }
+
+ public void Dispose()
+ {
+ ReferenceCountedProviders oldRefCountedProviders = _refCountedProviders;
+
+ // This lock ensures that we cannot reduce the ref count to zero before GetReference() calls AddReference().
+ // Once _disposed is set, GetReference() stops reference counting.
+ lock (_replaceProvidersLock)
+ {
+ _disposed = true;
+ }
+
+ // Never dispose ReferenceCountedProviders with a lock because this may call into user code.
+ oldRefCountedProviders.Dispose();
+ }
+ }
+}
diff --git a/src/libraries/Microsoft.Extensions.Configuration/tests/ConfigurationManagerTest.cs b/src/libraries/Microsoft.Extensions.Configuration/tests/ConfigurationManagerTest.cs
index 89da7883517544..aa36cceb424e5d 100644
--- a/src/libraries/Microsoft.Extensions.Configuration/tests/ConfigurationManagerTest.cs
+++ b/src/libraries/Microsoft.Extensions.Configuration/tests/ConfigurationManagerTest.cs
@@ -4,6 +4,8 @@
using System;
using System.Collections.Generic;
using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
using Microsoft.Extensions.Configuration.Memory;
using Microsoft.Extensions.Primitives;
using Moq;
@@ -171,6 +173,91 @@ public void DisposesProvidersOnRemoval()
Assert.True(provider5.IsDisposed);
}
+ [ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsThreadingSupported))]
+ public async Task ProviderCanBlockLoadWaitingOnConcurrentRead()
+ {
+ using var mre = new ManualResetEventSlim(false);
+ var provider = new BlockLoadOnMREProvider(mre, timeout: TimeSpan.FromSeconds(30));
+
+ var config = new ConfigurationManager();
+ IConfigurationBuilder builder = config;
+
+ // builder.Add(source) will block on provider.Load().
+ var loadTask = Task.Run(() => builder.Add(new TestConfigurationSource(provider)));
+ await provider.LoadStartedTask;
+
+ // Read configuration while provider.Load() is blocked waiting on us.
+ _ = config["key"];
+
+ // Unblock provider.Load()
+ mre.Set();
+
+ // This will throw if provider.Load() timed out instead of unblocking gracefully after the read.
+ await loadTask;
+ }
+
+ public static TheoryData ConcurrentReadActions
+ {
+ get
+ {
+ return new TheoryData>
+ {
+ config => _ = config["key"],
+ config => config.GetChildren(),
+ config => config.GetSection("key").GetChildren(),
+ };
+ }
+ }
+
+ [ConditionalTheory(typeof(PlatformDetection), nameof(PlatformDetection.IsThreadingSupported))]
+ [MemberData(nameof(ConcurrentReadActions))]
+ public async Task ProviderDisposeDelayedWaitingOnConcurrentRead(Action concurrentReadAction)
+ {
+ using var mre = new ManualResetEventSlim(false);
+ var provider = new BlockReadOnMREProvider(mre, timeout: TimeSpan.FromSeconds(30));
+
+ var config = new ConfigurationManager();
+ IConfigurationBuilder builder = config;
+
+ builder.Add(new TestConfigurationSource(provider));
+
+ // Reading configuration will block on provider.TryRead() or profvider.GetChildKeys().
+ var readTask = Task.Run(() => concurrentReadAction(config));
+ await provider.ReadStartedTask;
+
+ // Removing the source normally disposes the provider except when there provider is in use as is the case here.
+ builder.Sources.Clear();
+
+ Assert.False(provider.IsDisposed);
+
+ // Unblock TryRead() or GetChildKeys()
+ mre.Set();
+
+ // This will throw if TryRead() or GetChildKeys() timed out instead of unblocking gracefully after setting the MRE.
+ await readTask;
+
+ // The provider should be disposed when the concurrentReadAction releases the last reference to the provider.
+ Assert.True(provider.IsDisposed);
+ }
+
+ [Fact]
+ public void DisposingConfigurationManagerCausesOnlySourceChangesToThrow()
+ {
+ var config = new ConfigurationManager
+ {
+ ["TestKey"] = "TestValue",
+ };
+
+ config.Dispose();
+
+ Assert.Equal("TestValue", config["TestKey"]);
+ config["TestKey"] = "TestValue2";
+ Assert.Equal("TestValue2", config["TestKey"]);
+
+ Assert.Throws(() => config.AddInMemoryCollection());
+ Assert.Throws(() => ((IConfigurationBuilder)config).Sources.Clear());
+ }
+
[Fact]
public void DisposesChangeTokenRegistrationsOnDispose()
{
@@ -1128,6 +1215,62 @@ public TestConfigurationProvider(string key, string value)
=> Data.Add(key, value);
}
+ private class BlockLoadOnMREProvider : ConfigurationProvider
+ {
+ private readonly ManualResetEventSlim _mre;
+ private readonly TimeSpan _timeout;
+
+ private readonly TaskCompletionSource
diff --git a/src/libraries/Microsoft.Extensions.HostFactoryResolver/tests/ApplicationNameSetFromAgrument/ApplicationNameSetFromAgrument.csproj b/src/libraries/Microsoft.Extensions.HostFactoryResolver/tests/ApplicationNameSetFromAgrument/ApplicationNameSetFromAgrument.csproj
new file mode 100644
index 00000000000000..716b25a87281da
--- /dev/null
+++ b/src/libraries/Microsoft.Extensions.HostFactoryResolver/tests/ApplicationNameSetFromAgrument/ApplicationNameSetFromAgrument.csproj
@@ -0,0 +1,13 @@
+
+
+
+ $(NetCoreAppCurrent);net461
+ true
+ Exe
+
+
+
+
+
+
+
diff --git a/src/libraries/Microsoft.Extensions.HostFactoryResolver/tests/ApplicationNameSetFromAgrument/Program.cs b/src/libraries/Microsoft.Extensions.HostFactoryResolver/tests/ApplicationNameSetFromAgrument/Program.cs
new file mode 100644
index 00000000000000..f83f5c12af7966
--- /dev/null
+++ b/src/libraries/Microsoft.Extensions.HostFactoryResolver/tests/ApplicationNameSetFromAgrument/Program.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.
+
+using System;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.Hosting;
+
+var host = new HostBuilder().ConfigureAppConfiguration(builder => builder.AddCommandLine(args)).Build();
\ No newline at end of file
diff --git a/src/libraries/Microsoft.Extensions.HostFactoryResolver/tests/HostFactoryResolverTests.cs b/src/libraries/Microsoft.Extensions.HostFactoryResolver/tests/HostFactoryResolverTests.cs
index 8f6cf79de0bf3e..d6cf530c94e93a 100644
--- a/src/libraries/Microsoft.Extensions.HostFactoryResolver/tests/HostFactoryResolverTests.cs
+++ b/src/libraries/Microsoft.Extensions.HostFactoryResolver/tests/HostFactoryResolverTests.cs
@@ -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 Microsoft.Extensions.Configuration;
using MockHostTypes;
using System;
using System.Diagnostics.CodeAnalysis;
@@ -252,6 +253,27 @@ public void TopLevelStatements()
Assert.IsAssignableFrom(factory(Array.Empty()));
}
+ [ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsThreadingSupported))]
+ public void TopLevelStatementsTestsTimeout()
+ {
+ var assembly = Assembly.Load("TopLevelStatementsTestsTimeout");
+ var factory = HostFactoryResolver.ResolveServiceProviderFactory(assembly, s_WaitTimeout);
+
+ Assert.NotNull(factory);
+ Assert.Throws(() => factory(Array.Empty()));
+ }
+
+ [ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsThreadingSupported))]
+ public void ApplicationNameSetFromAgrument()
+ {
+ Assembly assembly = Assembly.Load("ApplicationNameSetFromAgrument");
+ var factory = HostFactoryResolver.ResolveServiceProviderFactory(assembly, s_WaitTimeout);
+ IServiceProvider? serviceProvider = factory(Array.Empty());
+
+ var configuration = (IConfiguration)serviceProvider.GetService(typeof(IConfiguration));
+ Assert.Contains("ApplicationNameSetFromAgrument", configuration["applicationName"]);
+ }
+
[ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsThreadingSupported))]
[DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(NoSpecialEntryPointPattern.Program))]
public void NoSpecialEntryPointPatternCanRunInParallel()
diff --git a/src/libraries/Microsoft.Extensions.HostFactoryResolver/tests/Microsoft.Extensions.HostFactoryResolver.Tests.csproj b/src/libraries/Microsoft.Extensions.HostFactoryResolver/tests/Microsoft.Extensions.HostFactoryResolver.Tests.csproj
index dc808c40b7cc99..fe811f1fe1b5df 100644
--- a/src/libraries/Microsoft.Extensions.HostFactoryResolver/tests/Microsoft.Extensions.HostFactoryResolver.Tests.csproj
+++ b/src/libraries/Microsoft.Extensions.HostFactoryResolver/tests/Microsoft.Extensions.HostFactoryResolver.Tests.csproj
@@ -14,6 +14,7 @@
+
@@ -27,6 +28,7 @@
+
diff --git a/src/libraries/Microsoft.Extensions.HostFactoryResolver/tests/TopLevelStatementsTestsTimeout/Program.cs b/src/libraries/Microsoft.Extensions.HostFactoryResolver/tests/TopLevelStatementsTestsTimeout/Program.cs
new file mode 100644
index 00000000000000..f4c01882987e12
--- /dev/null
+++ b/src/libraries/Microsoft.Extensions.HostFactoryResolver/tests/TopLevelStatementsTestsTimeout/Program.cs
@@ -0,0 +1,10 @@
+// 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.Threading;
+using Microsoft.Extensions.Hosting;
+
+var hostBuilder = new HostBuilder();
+Thread.Sleep(TimeSpan.FromSeconds(30));
+hostBuilder.Build();
\ No newline at end of file
diff --git a/src/libraries/Microsoft.Extensions.HostFactoryResolver/tests/TopLevelStatementsTestsTimeout/TopLevelStatementsTestsTimeout.csproj b/src/libraries/Microsoft.Extensions.HostFactoryResolver/tests/TopLevelStatementsTestsTimeout/TopLevelStatementsTestsTimeout.csproj
new file mode 100644
index 00000000000000..716b25a87281da
--- /dev/null
+++ b/src/libraries/Microsoft.Extensions.HostFactoryResolver/tests/TopLevelStatementsTestsTimeout/TopLevelStatementsTestsTimeout.csproj
@@ -0,0 +1,13 @@
+
+
+
+ $(NetCoreAppCurrent);net461
+ true
+ Exe
+
+
+
+
+
+
+
diff --git a/src/libraries/Microsoft.Extensions.Hosting.Systemd/Microsoft.Extensions.Hosting.Systemd.sln b/src/libraries/Microsoft.Extensions.Hosting.Systemd/Microsoft.Extensions.Hosting.Systemd.sln
index 4d180d0e8e5926..fad399ab4ffd49 100644
--- a/src/libraries/Microsoft.Extensions.Hosting.Systemd/Microsoft.Extensions.Hosting.Systemd.sln
+++ b/src/libraries/Microsoft.Extensions.Hosting.Systemd/Microsoft.Extensions.Hosting.Systemd.sln
@@ -71,8 +71,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Hostin
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Hosting", "..\Microsoft.Extensions.Hosting\src\Microsoft.Extensions.Hosting.csproj", "{AFC1BDAA-7E40-4118-BB80-F8057752A600}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Logging.Generators", "..\Microsoft.Extensions.Logging.Abstractions\gen\Microsoft.Extensions.Logging.Generators.csproj", "{21A8F1A2-DB8F-40BB-8B41-34FFBFF678BE}"
-EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Logging.Abstractions", "..\Microsoft.Extensions.Logging.Abstractions\ref\Microsoft.Extensions.Logging.Abstractions.csproj", "{860B845B-929F-4442-AED1-1F4186DBF497}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Logging.Abstractions", "..\Microsoft.Extensions.Logging.Abstractions\src\Microsoft.Extensions.Logging.Abstractions.csproj", "{A0AF82AE-ED18-4EEB-AD9A-B44017510F0C}"
@@ -131,8 +129,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Permissions
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Encodings.Web", "..\System.Text.Encodings.Web\src\System.Text.Encodings.Web.csproj", "{47A3CDB0-8252-4536-B61F-C2E10F6EC2B9}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Json.SourceGeneration", "..\System.Text.Json\gen\System.Text.Json.SourceGeneration.csproj", "{CA49BE02-D809-4F18-8E0B-54FA365429E3}"
-EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Json", "..\System.Text.Json\src\System.Text.Json.csproj", "{25474DE2-4D3D-4950-BDA7-CF6FE3CCD940}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Threading.AccessControl", "..\System.Threading.AccessControl\ref\System.Threading.AccessControl.csproj", "{6061433D-2A71-47B3-B34B-3EDF523ABB78}"
@@ -397,10 +393,6 @@ Global
{1A3EF133-CC86-4CC9-BBB8-333D41563AC3}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1A3EF133-CC86-4CC9-BBB8-333D41563AC3}.Release|Any CPU.ActiveCfg = Release|Any CPU
{1A3EF133-CC86-4CC9-BBB8-333D41563AC3}.Release|Any CPU.Build.0 = Release|Any CPU
- {CA49BE02-D809-4F18-8E0B-54FA365429E3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {CA49BE02-D809-4F18-8E0B-54FA365429E3}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {CA49BE02-D809-4F18-8E0B-54FA365429E3}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {CA49BE02-D809-4F18-8E0B-54FA365429E3}.Release|Any CPU.Build.0 = Release|Any CPU
{47A3CDB0-8252-4536-B61F-C2E10F6EC2B9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{47A3CDB0-8252-4536-B61F-C2E10F6EC2B9}.Debug|Any CPU.Build.0 = Debug|Any CPU
{47A3CDB0-8252-4536-B61F-C2E10F6EC2B9}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -509,7 +501,6 @@ Global
{3488D63C-0C29-442C-8145-407DE19C7480} = {192FD259-E55F-40C5-82EE-9E924EA6C3CB}
{2E027B76-275A-4FCE-9774-A2F8C3CD0C7E} = {192FD259-E55F-40C5-82EE-9E924EA6C3CB}
{578661A4-C136-4533-819E-AF3352F79953} = {192FD259-E55F-40C5-82EE-9E924EA6C3CB}
- {CA49BE02-D809-4F18-8E0B-54FA365429E3} = {192FD259-E55F-40C5-82EE-9E924EA6C3CB}
{47A3CDB0-8252-4536-B61F-C2E10F6EC2B9} = {192FD259-E55F-40C5-82EE-9E924EA6C3CB}
{C1ACBD81-9577-483B-8E33-819F1313114A} = {192FD259-E55F-40C5-82EE-9E924EA6C3CB}
{01DB5E6D-40C5-42F7-8F9D-6F8DBC591129} = {192FD259-E55F-40C5-82EE-9E924EA6C3CB}
diff --git a/src/libraries/Microsoft.Extensions.Hosting.WindowsServices/Directory.Build.props b/src/libraries/Microsoft.Extensions.Hosting.WindowsServices/Directory.Build.props
index 899ad9d38a52d6..3d31843054e721 100644
--- a/src/libraries/Microsoft.Extensions.Hosting.WindowsServices/Directory.Build.props
+++ b/src/libraries/Microsoft.Extensions.Hosting.WindowsServices/Directory.Build.props
@@ -2,6 +2,5 @@
hosting
- windows
diff --git a/src/libraries/Microsoft.Extensions.Hosting.WindowsServices/Microsoft.Extensions.Hosting.WindowsServices.sln b/src/libraries/Microsoft.Extensions.Hosting.WindowsServices/Microsoft.Extensions.Hosting.WindowsServices.sln
index d044381432e722..b07fcf11887c4b 100644
--- a/src/libraries/Microsoft.Extensions.Hosting.WindowsServices/Microsoft.Extensions.Hosting.WindowsServices.sln
+++ b/src/libraries/Microsoft.Extensions.Hosting.WindowsServices/Microsoft.Extensions.Hosting.WindowsServices.sln
@@ -67,8 +67,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Hostin
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Hosting", "..\Microsoft.Extensions.Hosting\src\Microsoft.Extensions.Hosting.csproj", "{36FAE390-EAAE-4193-98E7-34F10D3FA8E1}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Logging.Generators", "..\Microsoft.Extensions.Logging.Abstractions\gen\Microsoft.Extensions.Logging.Generators.csproj", "{9CECED3B-385A-4C54-9E07-74E8341EB52D}"
-EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Logging.Abstractions", "..\Microsoft.Extensions.Logging.Abstractions\ref\Microsoft.Extensions.Logging.Abstractions.csproj", "{723957C4-C433-4B6D-BF0C-28AE36AEDDBD}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Logging.Abstractions", "..\Microsoft.Extensions.Logging.Abstractions\src\Microsoft.Extensions.Logging.Abstractions.csproj", "{E5F61C36-FB9B-4DA7-96C0-056FBEADBB53}"
@@ -131,8 +129,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.ServiceProcess.Servi
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Encodings.Web", "..\System.Text.Encodings.Web\src\System.Text.Encodings.Web.csproj", "{2D8B86CE-7A3A-45F0-9127-AE6CDCEC6EA5}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Json.SourceGeneration", "..\System.Text.Json\gen\System.Text.Json.SourceGeneration.csproj", "{CC36DF9A-6602-47D9-B44B-C2D2C33A80D0}"
-EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Json", "..\System.Text.Json\src\System.Text.Json.csproj", "{C50BBD27-2445-4DF4-9A1D-C7919D016BBC}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Threading.AccessControl", "..\System.Threading.AccessControl\ref\System.Threading.AccessControl.csproj", "{B7ACDBBE-C64B-482B-B80D-3DC002AD450B}"
@@ -419,10 +415,6 @@ Global
{B7ACDBBE-C64B-482B-B80D-3DC002AD450B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B7ACDBBE-C64B-482B-B80D-3DC002AD450B}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B7ACDBBE-C64B-482B-B80D-3DC002AD450B}.Release|Any CPU.Build.0 = Release|Any CPU
- {CC36DF9A-6602-47D9-B44B-C2D2C33A80D0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {CC36DF9A-6602-47D9-B44B-C2D2C33A80D0}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {CC36DF9A-6602-47D9-B44B-C2D2C33A80D0}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {CC36DF9A-6602-47D9-B44B-C2D2C33A80D0}.Release|Any CPU.Build.0 = Release|Any CPU
{2D8B86CE-7A3A-45F0-9127-AE6CDCEC6EA5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{2D8B86CE-7A3A-45F0-9127-AE6CDCEC6EA5}.Debug|Any CPU.Build.0 = Debug|Any CPU
{2D8B86CE-7A3A-45F0-9127-AE6CDCEC6EA5}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -509,7 +501,6 @@ Global
{C50BBD27-2445-4DF4-9A1D-C7919D016BBC} = {76933DF1-12AA-4B5B-8863-EF38F10B1EC9}
{83D8F9FB-0A8D-4E48-A7CF-D169432A41AD} = {76933DF1-12AA-4B5B-8863-EF38F10B1EC9}
{BAE78100-3020-4AAE-BDBF-ACF9D1D1BA2F} = {76933DF1-12AA-4B5B-8863-EF38F10B1EC9}
- {CC36DF9A-6602-47D9-B44B-C2D2C33A80D0} = {76933DF1-12AA-4B5B-8863-EF38F10B1EC9}
{2D8B86CE-7A3A-45F0-9127-AE6CDCEC6EA5} = {76933DF1-12AA-4B5B-8863-EF38F10B1EC9}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
diff --git a/src/libraries/Microsoft.Extensions.Hosting/Directory.Build.props b/src/libraries/Microsoft.Extensions.Hosting/Directory.Build.props
index 43dc3a2640bbae..207017db91b3d1 100644
--- a/src/libraries/Microsoft.Extensions.Hosting/Directory.Build.props
+++ b/src/libraries/Microsoft.Extensions.Hosting/Directory.Build.props
@@ -2,5 +2,6 @@
true
+ 1
diff --git a/src/libraries/Microsoft.Extensions.Hosting/Microsoft.Extensions.Hosting.sln b/src/libraries/Microsoft.Extensions.Hosting/Microsoft.Extensions.Hosting.sln
index a9809bec457afd..529c17516ab669 100644
--- a/src/libraries/Microsoft.Extensions.Hosting/Microsoft.Extensions.Hosting.sln
+++ b/src/libraries/Microsoft.Extensions.Hosting/Microsoft.Extensions.Hosting.sln
@@ -71,8 +71,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Hostin
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Hosting.Unit.Tests", "tests\UnitTests\Microsoft.Extensions.Hosting.Unit.Tests.csproj", "{33C3D8F0-297F-4471-92B0-F4E8717F10E3}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Logging.Generators", "..\Microsoft.Extensions.Logging.Abstractions\gen\Microsoft.Extensions.Logging.Generators.csproj", "{FBF0B5C9-CD20-4B8A-83B4-6281A2EEBC45}"
-EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Logging.Abstractions", "..\Microsoft.Extensions.Logging.Abstractions\ref\Microsoft.Extensions.Logging.Abstractions.csproj", "{42E1BF94-6FE0-4017-9702-55913BD95EDE}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Logging.Abstractions", "..\Microsoft.Extensions.Logging.Abstractions\src\Microsoft.Extensions.Logging.Abstractions.csproj", "{8845E6FF-94B2-4994-A8F4-DF30844A2168}"
@@ -131,8 +129,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Permissions
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Encodings.Web", "..\System.Text.Encodings.Web\src\System.Text.Encodings.Web.csproj", "{B41AA17B-5129-41CC-8EA4-250B80BABF87}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Json.SourceGeneration", "..\System.Text.Json\gen\System.Text.Json.SourceGeneration.csproj", "{631AE96F-2615-4D38-B3BB-0D98777C4667}"
-EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Json", "..\System.Text.Json\src\System.Text.Json.csproj", "{0813853E-8C78-429A-B01A-3FB2EF1898F8}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Threading.AccessControl", "..\System.Threading.AccessControl\ref\System.Threading.AccessControl.csproj", "{6F69FD88-7BD1-41DF-BF5D-F0E5F12BE766}"
@@ -401,10 +397,6 @@ Global
{014EE6B4-BE08-4E50-9EBD-0D7A0CB7A76E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{014EE6B4-BE08-4E50-9EBD-0D7A0CB7A76E}.Release|Any CPU.ActiveCfg = Release|Any CPU
{014EE6B4-BE08-4E50-9EBD-0D7A0CB7A76E}.Release|Any CPU.Build.0 = Release|Any CPU
- {631AE96F-2615-4D38-B3BB-0D98777C4667}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {631AE96F-2615-4D38-B3BB-0D98777C4667}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {631AE96F-2615-4D38-B3BB-0D98777C4667}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {631AE96F-2615-4D38-B3BB-0D98777C4667}.Release|Any CPU.Build.0 = Release|Any CPU
{B41AA17B-5129-41CC-8EA4-250B80BABF87}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B41AA17B-5129-41CC-8EA4-250B80BABF87}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B41AA17B-5129-41CC-8EA4-250B80BABF87}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -509,7 +501,6 @@ Global
{0AEAD15B-CD38-4462-A36C-655ED8D0CBD1} = {59A29BF0-B76B-41F8-A733-E2A0847AB992}
{0BC9E4F4-5C34-4B90-80AB-2933992D99A6} = {59A29BF0-B76B-41F8-A733-E2A0847AB992}
{4ED9C0A9-C1EF-47ED-99F8-74B7411C971B} = {59A29BF0-B76B-41F8-A733-E2A0847AB992}
- {631AE96F-2615-4D38-B3BB-0D98777C4667} = {59A29BF0-B76B-41F8-A733-E2A0847AB992}
{B41AA17B-5129-41CC-8EA4-250B80BABF87} = {59A29BF0-B76B-41F8-A733-E2A0847AB992}
{C58E2CF3-F8AA-47C1-8A49-65B91252F2AA} = {59A29BF0-B76B-41F8-A733-E2A0847AB992}
{A5DD36AF-F0AD-4616-AB91-BC63E89B2744} = {59A29BF0-B76B-41F8-A733-E2A0847AB992}
diff --git a/src/libraries/Microsoft.Extensions.Hosting/src/Internal/Host.cs b/src/libraries/Microsoft.Extensions.Hosting/src/Internal/Host.cs
index 4041133a0a9f25..2f73146e695ef2 100644
--- a/src/libraries/Microsoft.Extensions.Hosting/src/Internal/Host.cs
+++ b/src/libraries/Microsoft.Extensions.Hosting/src/Internal/Host.cs
@@ -79,15 +79,22 @@ public async Task StartAsync(CancellationToken cancellationToken = default)
private async Task TryExecuteBackgroundServiceAsync(BackgroundService backgroundService)
{
+ // backgroundService.ExecuteTask may not be set (e.g. if the derived class doesn't call base.StartAsync)
+ Task backgroundTask = backgroundService.ExecuteTask;
+ if (backgroundTask == null)
+ {
+ return;
+ }
+
try
{
- await backgroundService.ExecuteTask.ConfigureAwait(false);
+ await backgroundTask.ConfigureAwait(false);
}
catch (Exception ex)
{
// When the host is being stopped, it cancels the background services.
// This isn't an error condition, so don't log it as an error.
- if (_stopCalled && backgroundService.ExecuteTask.IsCanceled && ex is OperationCanceledException)
+ if (_stopCalled && backgroundTask.IsCanceled && ex is OperationCanceledException)
{
return;
}
diff --git a/src/libraries/Microsoft.Extensions.Hosting/src/Microsoft.Extensions.Hosting.csproj b/src/libraries/Microsoft.Extensions.Hosting/src/Microsoft.Extensions.Hosting.csproj
index b868be57845e0c..5962169ce1aea5 100644
--- a/src/libraries/Microsoft.Extensions.Hosting/src/Microsoft.Extensions.Hosting.csproj
+++ b/src/libraries/Microsoft.Extensions.Hosting/src/Microsoft.Extensions.Hosting.csproj
@@ -1,4 +1,4 @@
-
+
$(NetCoreAppCurrent);netstandard2.0;netstandard2.1;net461
@@ -6,6 +6,7 @@
Hosting and startup infrastructures for applications.
false
+
diff --git a/src/libraries/Microsoft.Extensions.Hosting/tests/UnitTests/Internal/HostTests.cs b/src/libraries/Microsoft.Extensions.Hosting/tests/UnitTests/Internal/HostTests.cs
index d07c2bc57eaa71..b3133dba3be886 100644
--- a/src/libraries/Microsoft.Extensions.Hosting/tests/UnitTests/Internal/HostTests.cs
+++ b/src/libraries/Microsoft.Extensions.Hosting/tests/UnitTests/Internal/HostTests.cs
@@ -1394,6 +1394,36 @@ public async Task HostNoErrorWhenServiceIsCanceledAsPartOfStop()
}
}
+ ///
+ /// Tests that when a BackgroundService does not call base, the Host still starts and stops successfully.
+ ///
+ [Fact]
+ public async Task StartOnBackgroundServiceThatDoesNotCallBase()
+ {
+ TestLoggerProvider logger = new TestLoggerProvider();
+
+ using IHost host = CreateBuilder()
+ .ConfigureLogging(logging =>
+ {
+ logging.AddProvider(logger);
+ })
+ .ConfigureServices(services =>
+ {
+ services.AddHostedService();
+ })
+ .Build();
+
+ host.Start();
+ await host.StopAsync();
+
+ foreach (LogEvent logEvent in logger.GetEvents())
+ {
+ Assert.True(logEvent.LogLevel <= LogLevel.Information, "All logged events should be less than or equal to Information. No Warnings or Errors.");
+
+ Assert.NotEqual("BackgroundServiceFaulted", logEvent.EventId.Name);
+ }
+ }
+
private IHostBuilder CreateBuilder(IConfiguration config = null)
{
return new HostBuilder().ConfigureHostConfiguration(builder => builder.AddConfiguration(config ?? new ConfigurationBuilder().Build()));
@@ -1562,5 +1592,14 @@ protected override async Task ExecuteAsync(CancellationToken stoppingToken)
}
}
}
+
+ private class BackgroundServiceDoesNotCallBase : BackgroundService
+ {
+ public override Task StartAsync(CancellationToken cancellationToken) => Task.CompletedTask;
+
+ protected override Task ExecuteAsync(CancellationToken stoppingToken) => Task.CompletedTask;
+
+ public override Task StopAsync(CancellationToken cancellationToken) => Task.CompletedTask;
+ }
}
}
diff --git a/src/libraries/Microsoft.Extensions.Hosting/tests/UnitTests/Microsoft.Extensions.Hosting.Unit.Tests.csproj b/src/libraries/Microsoft.Extensions.Hosting/tests/UnitTests/Microsoft.Extensions.Hosting.Unit.Tests.csproj
index ee0c814c41b3f0..babb650155cbfb 100644
--- a/src/libraries/Microsoft.Extensions.Hosting/tests/UnitTests/Microsoft.Extensions.Hosting.Unit.Tests.csproj
+++ b/src/libraries/Microsoft.Extensions.Hosting/tests/UnitTests/Microsoft.Extensions.Hosting.Unit.Tests.csproj
@@ -18,4 +18,10 @@
+
+
+
+
+
diff --git a/src/libraries/Microsoft.Extensions.Http/Microsoft.Extensions.Http.sln b/src/libraries/Microsoft.Extensions.Http/Microsoft.Extensions.Http.sln
index bbb76ebd7a1ab7..1f763e573612b6 100644
--- a/src/libraries/Microsoft.Extensions.Http/Microsoft.Extensions.Http.sln
+++ b/src/libraries/Microsoft.Extensions.Http/Microsoft.Extensions.Http.sln
@@ -19,8 +19,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Http",
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Http.Tests", "tests\Microsoft.Extensions.Http.Tests\Microsoft.Extensions.Http.Tests.csproj", "{58A1E42E-5DA1-452A-B39C-A1819171970A}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Logging.Generators", "..\Microsoft.Extensions.Logging.Abstractions\gen\Microsoft.Extensions.Logging.Generators.csproj", "{3DD4EF0E-36D5-48BD-8F8A-1D7DAF74EC25}"
-EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Logging.Abstractions", "..\Microsoft.Extensions.Logging.Abstractions\ref\Microsoft.Extensions.Logging.Abstractions.csproj", "{85615392-9242-4CAF-A0FE-A439FF615462}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Logging.Abstractions", "..\Microsoft.Extensions.Logging.Abstractions\src\Microsoft.Extensions.Logging.Abstractions.csproj", "{BAFF07C7-1F5F-4706-B7D7-9D5D309CBFE2}"
diff --git a/src/libraries/Microsoft.Extensions.Logging.Abstractions/Microsoft.Extensions.Logging.Abstractions.sln b/src/libraries/Microsoft.Extensions.Logging.Abstractions/Microsoft.Extensions.Logging.Abstractions.sln
index 869ed2e72f0dd8..147339db0e9240 100644
--- a/src/libraries/Microsoft.Extensions.Logging.Abstractions/Microsoft.Extensions.Logging.Abstractions.sln
+++ b/src/libraries/Microsoft.Extensions.Logging.Abstractions/Microsoft.Extensions.Logging.Abstractions.sln
@@ -1,13 +1,11 @@
Microsoft Visual Studio Solution File, Format Version 12.00
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{79CE8C7E-A4AF-413C-A54D-86F17073559C}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Logging.Generators", "gen\Microsoft.Extensions.Logging.Generators.csproj", "{1CB925AD-09DA-4734-BA05-619A00E5B448}"
-EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Logging.Abstractions", "ref\Microsoft.Extensions.Logging.Abstractions.csproj", "{7F536552-0E2A-4642-B7CF-863727C2F9CD}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Logging.Abstractions", "src\Microsoft.Extensions.Logging.Abstractions.csproj", "{75C579F7-F20B-41F1-8CAF-641DE7ADA4EE}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Logging.Generators.Tests", "tests\Microsoft.Extensions.Logging.Generators.Tests\Microsoft.Extensions.Logging.Generators.Tests.csproj", "{1CB869A7-2EEC-4A53-9C33-DF9E0C75825B}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Logging.Generators.Roslyn4.0.Tests", "tests\Microsoft.Extensions.Logging.Generators.Tests\Microsoft.Extensions.Logging.Generators.Roslyn4.0.Tests.csproj", "{1CB869A7-2EEC-4A53-9C33-DF9E0C75825B}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{DAA1349E-960E-49EB-81F3-FF4F99D8A325}"
EndProject
@@ -19,6 +17,12 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{4DE63935
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{548DF5F7-790C-4A1C-89EB-BD904CA1BA86}"
EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Logging.Generators.Roslyn4.0", "gen\Microsoft.Extensions.Logging.Generators.Roslyn4.0.csproj", "{A5439E79-96D6-4F02-8DD0-23DFF979851D}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Logging.Generators.Roslyn3.11", "gen\Microsoft.Extensions.Logging.Generators.Roslyn3.11.csproj", "{1491B9C9-955D-4DB0-B1D5-70137A78EAAE}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Logging.Generators.Roslyn3.11.Tests", "tests\Microsoft.Extensions.Logging.Generators.Tests\Microsoft.Extensions.Logging.Generators.Roslyn3.11.Tests.csproj", "{C333EC5A-F386-4A01-AE20-12D499551304}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -41,18 +45,38 @@ Global
{79CE8C7E-A4AF-413C-A54D-86F17073559C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{79CE8C7E-A4AF-413C-A54D-86F17073559C}.Release|Any CPU.ActiveCfg = Release|Any CPU
{79CE8C7E-A4AF-413C-A54D-86F17073559C}.Release|Any CPU.Build.0 = Release|Any CPU
- {1CB925AD-09DA-4734-BA05-619A00E5B448}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {1CB925AD-09DA-4734-BA05-619A00E5B448}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {1CB925AD-09DA-4734-BA05-619A00E5B448}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {1CB925AD-09DA-4734-BA05-619A00E5B448}.Release|Any CPU.Build.0 = Release|Any CPU
- {F8CF3192-B902-4631-972A-C405FDECC48D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {F8CF3192-B902-4631-972A-C405FDECC48D}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {F8CF3192-B902-4631-972A-C405FDECC48D}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {F8CF3192-B902-4631-972A-C405FDECC48D}.Release|Any CPU.Build.0 = Release|Any CPU
+ {7F536552-0E2A-4642-B7CF-863727C2F9CD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {7F536552-0E2A-4642-B7CF-863727C2F9CD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {7F536552-0E2A-4642-B7CF-863727C2F9CD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {7F536552-0E2A-4642-B7CF-863727C2F9CD}.Release|Any CPU.Build.0 = Release|Any CPU
+ {75C579F7-F20B-41F1-8CAF-641DE7ADA4EE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {75C579F7-F20B-41F1-8CAF-641DE7ADA4EE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {75C579F7-F20B-41F1-8CAF-641DE7ADA4EE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {75C579F7-F20B-41F1-8CAF-641DE7ADA4EE}.Release|Any CPU.Build.0 = Release|Any CPU
+ {1CB869A7-2EEC-4A53-9C33-DF9E0C75825B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {1CB869A7-2EEC-4A53-9C33-DF9E0C75825B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {1CB869A7-2EEC-4A53-9C33-DF9E0C75825B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {1CB869A7-2EEC-4A53-9C33-DF9E0C75825B}.Release|Any CPU.Build.0 = Release|Any CPU
{DAA1349E-960E-49EB-81F3-FF4F99D8A325}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{DAA1349E-960E-49EB-81F3-FF4F99D8A325}.Debug|Any CPU.Build.0 = Debug|Any CPU
{DAA1349E-960E-49EB-81F3-FF4F99D8A325}.Release|Any CPU.ActiveCfg = Release|Any CPU
{DAA1349E-960E-49EB-81F3-FF4F99D8A325}.Release|Any CPU.Build.0 = Release|Any CPU
+ {F8CF3192-B902-4631-972A-C405FDECC48D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {F8CF3192-B902-4631-972A-C405FDECC48D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {F8CF3192-B902-4631-972A-C405FDECC48D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {F8CF3192-B902-4631-972A-C405FDECC48D}.Release|Any CPU.Build.0 = Release|Any CPU
+ {A5439E79-96D6-4F02-8DD0-23DFF979851D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {A5439E79-96D6-4F02-8DD0-23DFF979851D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {A5439E79-96D6-4F02-8DD0-23DFF979851D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {A5439E79-96D6-4F02-8DD0-23DFF979851D}.Release|Any CPU.Build.0 = Release|Any CPU
+ {1491B9C9-955D-4DB0-B1D5-70137A78EAAE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {1491B9C9-955D-4DB0-B1D5-70137A78EAAE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {1491B9C9-955D-4DB0-B1D5-70137A78EAAE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {1491B9C9-955D-4DB0-B1D5-70137A78EAAE}.Release|Any CPU.Build.0 = Release|Any CPU
+ {C333EC5A-F386-4A01-AE20-12D499551304}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {C333EC5A-F386-4A01-AE20-12D499551304}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {C333EC5A-F386-4A01-AE20-12D499551304}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {C333EC5A-F386-4A01-AE20-12D499551304}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -62,9 +86,14 @@ Global
{DAA1349E-960E-49EB-81F3-FF4F99D8A325} = {7631380A-FB73-4241-9987-0891A21E9769}
{1CB869A7-2EEC-4A53-9C33-DF9E0C75825B} = {4DE63935-DCA9-4D63-9C1F-AAE79C89CA8B}
{79CE8C7E-A4AF-413C-A54D-86F17073559C} = {4DE63935-DCA9-4D63-9C1F-AAE79C89CA8B}
+ {7F536552-0E2A-4642-B7CF-863727C2F9CD} = {7631380A-FB73-4241-9987-0891A21E9769}
{75C579F7-F20B-41F1-8CAF-641DE7ADA4EE} = {548DF5F7-790C-4A1C-89EB-BD904CA1BA86}
- {1CB925AD-09DA-4734-BA05-619A00E5B448} = {548DF5F7-790C-4A1C-89EB-BD904CA1BA86}
+ {1CB869A7-2EEC-4A53-9C33-DF9E0C75825B} = {4DE63935-DCA9-4D63-9C1F-AAE79C89CA8B}
+ {DAA1349E-960E-49EB-81F3-FF4F99D8A325} = {7631380A-FB73-4241-9987-0891A21E9769}
{F8CF3192-B902-4631-972A-C405FDECC48D} = {548DF5F7-790C-4A1C-89EB-BD904CA1BA86}
+ {A5439E79-96D6-4F02-8DD0-23DFF979851D} = {548DF5F7-790C-4A1C-89EB-BD904CA1BA86}
+ {1491B9C9-955D-4DB0-B1D5-70137A78EAAE} = {548DF5F7-790C-4A1C-89EB-BD904CA1BA86}
+ {C333EC5A-F386-4A01-AE20-12D499551304} = {4DE63935-DCA9-4D63-9C1F-AAE79C89CA8B}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {450DA749-CBDC-4BDC-950F-8A491CF59D49}
diff --git a/src/libraries/Microsoft.Extensions.Logging.Abstractions/gen/LoggerMessageGenerator.Emitter.cs b/src/libraries/Microsoft.Extensions.Logging.Abstractions/gen/LoggerMessageGenerator.Emitter.cs
index 53dd062b5d4b4c..249672b37058b1 100644
--- a/src/libraries/Microsoft.Extensions.Logging.Abstractions/gen/LoggerMessageGenerator.Emitter.cs
+++ b/src/libraries/Microsoft.Extensions.Logging.Abstractions/gen/LoggerMessageGenerator.Emitter.cs
@@ -78,7 +78,7 @@ namespace {lc.Namespace}
// loop until you find top level nested class
while (parent != null)
{
- parentClasses.Add($"partial {parent.Keyword} {parent.Name} {parent.Constraints}");
+ parentClasses.Add($"partial {parent.Keyword} {parent.Name} ");
parent = parent.ParentClass;
}
@@ -92,7 +92,7 @@ namespace {lc.Namespace}
}
_builder.Append($@"
- {nestedIndentation}partial {lc.Keyword} {lc.Name} {lc.Constraints}
+ {nestedIndentation}partial {lc.Keyword} {lc.Name}
{nestedIndentation}{{");
foreach (LoggerMethod lm in lc.Methods)
@@ -196,7 +196,7 @@ private void GenFieldAssignments(LoggerMethod lm, string nestedIndentation)
{
foreach (LoggerParameter p in lm.TemplateParameters)
{
- _builder.AppendLine($" {nestedIndentation}this._{p.Name} = {p.Name};");
+ _builder.AppendLine($" {nestedIndentation}this._{p.Name} = {p.CodeName};");
}
}
@@ -255,7 +255,7 @@ private void GenCallbackArguments(LoggerMethod lm)
{
foreach (LoggerParameter p in lm.TemplateParameters)
{
- _builder.Append($"{p.Name}, ");
+ _builder.Append($"{p.CodeName}, ");
}
}
@@ -309,7 +309,11 @@ private void GenParameters(LoggerMethod lm)
_builder.Append(", ");
}
- _builder.Append($"{p.Type} {p.Name}");
+ if (p.Qualifier != null)
+ {
+ _builder.Append($"{p.Qualifier} ");
+ }
+ _builder.Append($"{p.Type} {p.CodeName}");
}
}
@@ -327,7 +331,7 @@ private void GenArguments(LoggerMethod lm)
_builder.Append(", ");
}
- _builder.Append($"{p.Type} {p.Name}");
+ _builder.Append($"{p.Type} {p.CodeName}");
}
}
@@ -343,7 +347,7 @@ private void GenHolder(LoggerMethod lm)
_builder.Append(", ");
}
- _builder.Append(p.Name);
+ _builder.Append(p.CodeName);
}
_builder.Append(')');
diff --git a/src/libraries/Microsoft.Extensions.Logging.Abstractions/gen/LoggerMessageGenerator.Parser.cs b/src/libraries/Microsoft.Extensions.Logging.Abstractions/gen/LoggerMessageGenerator.Parser.cs
index 4a995039104b9d..592ee84655139e 100644
--- a/src/libraries/Microsoft.Extensions.Logging.Abstractions/gen/LoggerMessageGenerator.Parser.cs
+++ b/src/libraries/Microsoft.Extensions.Logging.Abstractions/gen/LoggerMessageGenerator.Parser.cs
@@ -10,6 +10,7 @@
using Microsoft.CodeAnalysis.CSharp;
using Microsoft.CodeAnalysis.CSharp.Syntax;
using System.Collections.Immutable;
+using Microsoft.CodeAnalysis.DotnetRuntime.Extensions;
namespace Microsoft.Extensions.Logging.Generators
{
@@ -17,6 +18,8 @@ public partial class LoggerMessageGenerator
{
internal class Parser
{
+ private const string LoggerMessageAttribute = "Microsoft.Extensions.Logging.LoggerMessageAttribute";
+
private readonly CancellationToken _cancellationToken;
private readonly Compilation _compilation;
private readonly Action _reportDiagnostic;
@@ -28,35 +31,63 @@ public Parser(Compilation compilation, Action reportDiagnostic, Canc
_reportDiagnostic = reportDiagnostic;
}
+ internal static bool IsSyntaxTargetForGeneration(SyntaxNode node) =>
+ node is MethodDeclarationSyntax m && m.AttributeLists.Count > 0;
+
+ internal static ClassDeclarationSyntax? GetSemanticTargetForGeneration(GeneratorSyntaxContext context)
+ {
+ var methodDeclarationSyntax = (MethodDeclarationSyntax)context.Node;
+
+ foreach (AttributeListSyntax attributeListSyntax in methodDeclarationSyntax.AttributeLists)
+ {
+ foreach (AttributeSyntax attributeSyntax in attributeListSyntax.Attributes)
+ {
+ IMethodSymbol attributeSymbol = context.SemanticModel.GetSymbolInfo(attributeSyntax).Symbol as IMethodSymbol;
+ if (attributeSymbol == null)
+ {
+ continue;
+ }
+
+ INamedTypeSymbol attributeContainingTypeSymbol = attributeSymbol.ContainingType;
+ string fullName = attributeContainingTypeSymbol.ToDisplayString();
+
+ if (fullName == LoggerMessageAttribute)
+ {
+ return methodDeclarationSyntax.Parent as ClassDeclarationSyntax;
+ }
+ }
+ }
+
+ return null;
+ }
+
///
/// Gets the set of logging classes containing methods to output.
///
public IReadOnlyList GetLogClasses(IEnumerable classes)
{
- const string LoggerMessageAttribute = "Microsoft.Extensions.Logging.LoggerMessageAttribute";
-
- INamedTypeSymbol loggerMessageAttribute = _compilation.GetTypeByMetadataName(LoggerMessageAttribute);
+ INamedTypeSymbol loggerMessageAttribute = _compilation.GetBestTypeByMetadataName(LoggerMessageAttribute);
if (loggerMessageAttribute == null)
{
// nothing to do if this type isn't available
return Array.Empty();
}
- INamedTypeSymbol loggerSymbol = _compilation.GetTypeByMetadataName("Microsoft.Extensions.Logging.ILogger");
+ INamedTypeSymbol loggerSymbol = _compilation.GetBestTypeByMetadataName("Microsoft.Extensions.Logging.ILogger");
if (loggerSymbol == null)
{
// nothing to do if this type isn't available
return Array.Empty();
}
- INamedTypeSymbol logLevelSymbol = _compilation.GetTypeByMetadataName("Microsoft.Extensions.Logging.LogLevel");
+ INamedTypeSymbol logLevelSymbol = _compilation.GetBestTypeByMetadataName("Microsoft.Extensions.Logging.LogLevel");
if (logLevelSymbol == null)
{
// nothing to do if this type isn't available
return Array.Empty();
}
- INamedTypeSymbol exceptionSymbol = _compilation.GetTypeByMetadataName("System.Exception");
+ INamedTypeSymbol exceptionSymbol = _compilation.GetBestTypeByMetadataName("System.Exception");
if (exceptionSymbol == null)
{
Diag(DiagnosticDescriptors.MissingRequiredType, null, "System.Exception");
@@ -277,6 +308,15 @@ public IReadOnlyList GetLogClasses(IEnumerable 0)
+ {
+ ParameterSyntax paramSyntax = paramSymbol.DeclaringSyntaxReferences[0].GetSyntax(_cancellationToken) as ParameterSyntax;
+ if (paramSyntax != null && !string.IsNullOrEmpty(paramSyntax.Identifier.Text))
+ {
+ needsAtSign = paramSyntax.Identifier.Text[0] == '@';
+ }
+ }
if (string.IsNullOrWhiteSpace(paramName))
{
// semantic problem, just bail quietly
@@ -292,6 +332,15 @@ public IReadOnlyList GetLogClasses(IEnumerable GetLogClasses(IEnumerable GetLogClasses(IEnumerable GetLogClasses(IEnumerable
+ bool IsAllowedKind(SyntaxKind kind) =>
kind == SyntaxKind.ClassDeclaration ||
kind == SyntaxKind.StructDeclaration ||
kind == SyntaxKind.RecordDeclaration;
-
+
while (parentLoggerClass != null && IsAllowedKind(parentLoggerClass.Kind()))
{
currentLoggerClass.ParentClass = new LoggerClass
@@ -454,7 +514,6 @@ bool IsAllowedKind(SyntaxKind kind) =>
Keyword = parentLoggerClass.Keyword.ValueText,
Namespace = nspace,
Name = parentLoggerClass.Identifier.ToString() + parentLoggerClass.TypeParameterList,
- Constraints = parentLoggerClass.ConstraintClauses.ToString(),
ParentClass = null,
};
@@ -640,7 +699,6 @@ internal class LoggerClass
public string Keyword = string.Empty;
public string Namespace = string.Empty;
public string Name = string.Empty;
- public string Constraints = string.Empty;
public LoggerClass? ParentClass;
}
@@ -671,6 +729,8 @@ internal class LoggerParameter
{
public string Name = string.Empty;
public string Type = string.Empty;
+ public string CodeName = string.Empty;
+ public string? Qualifier;
public bool IsLogger;
public bool IsException;
public bool IsLogLevel;
diff --git a/src/libraries/Microsoft.Extensions.Logging.Abstractions/gen/LoggerMessageGenerator.cs b/src/libraries/Microsoft.Extensions.Logging.Abstractions/gen/LoggerMessageGenerator.Roslyn3.11.cs
similarity index 61%
rename from src/libraries/Microsoft.Extensions.Logging.Abstractions/gen/LoggerMessageGenerator.cs
rename to src/libraries/Microsoft.Extensions.Logging.Abstractions/gen/LoggerMessageGenerator.Roslyn3.11.cs
index 92105d515e328c..52a42cec41d08c 100644
--- a/src/libraries/Microsoft.Extensions.Logging.Abstractions/gen/LoggerMessageGenerator.cs
+++ b/src/libraries/Microsoft.Extensions.Logging.Abstractions/gen/LoggerMessageGenerator.Roslyn3.11.cs
@@ -1,10 +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 System.Diagnostics.CodeAnalysis;
-using System.Runtime.CompilerServices;
using System.Text;
using Microsoft.CodeAnalysis;
using Microsoft.CodeAnalysis.CSharp.Syntax;
@@ -17,16 +14,14 @@ namespace Microsoft.Extensions.Logging.Generators
[Generator]
public partial class LoggerMessageGenerator : ISourceGenerator
{
- [ExcludeFromCodeCoverage]
public void Initialize(GeneratorInitializationContext context)
{
- context.RegisterForSyntaxNotifications(SyntaxReceiver.Create);
+ context.RegisterForSyntaxNotifications(SyntaxContextReceiver.Create);
}
- [ExcludeFromCodeCoverage]
public void Execute(GeneratorExecutionContext context)
{
- if (context.SyntaxReceiver is not SyntaxReceiver receiver || receiver.ClassDeclarations.Count == 0)
+ if (context.SyntaxContextReceiver is not SyntaxContextReceiver receiver || receiver.ClassDeclarations.Count == 0)
{
// nothing to do yet
return;
@@ -38,26 +33,29 @@ public void Execute(GeneratorExecutionContext context)
{
var e = new Emitter();
string result = e.Emit(logClasses, context.CancellationToken);
-
+
context.AddSource("LoggerMessage.g.cs", SourceText.From(result, Encoding.UTF8));
}
}
- [ExcludeFromCodeCoverage]
- private sealed class SyntaxReceiver : ISyntaxReceiver
+ private sealed class SyntaxContextReceiver : ISyntaxContextReceiver
{
- internal static ISyntaxReceiver Create()
+ internal static ISyntaxContextReceiver Create()
{
- return new SyntaxReceiver();
+ return new SyntaxContextReceiver();
}
- public List ClassDeclarations { get; } = new ();
+ public HashSet ClassDeclarations { get; } = new();
- public void OnVisitSyntaxNode(SyntaxNode syntaxNode)
+ public void OnVisitSyntaxNode(GeneratorSyntaxContext context)
{
- if (syntaxNode is ClassDeclarationSyntax classSyntax)
+ if (Parser.IsSyntaxTargetForGeneration(context.Node))
{
- ClassDeclarations.Add(classSyntax);
+ ClassDeclarationSyntax classSyntax = Parser.GetSemanticTargetForGeneration(context);
+ if (classSyntax != null)
+ {
+ ClassDeclarations.Add(classSyntax);
+ }
}
}
}
diff --git a/src/libraries/Microsoft.Extensions.Logging.Abstractions/gen/LoggerMessageGenerator.Roslyn4.0.cs b/src/libraries/Microsoft.Extensions.Logging.Abstractions/gen/LoggerMessageGenerator.Roslyn4.0.cs
new file mode 100644
index 00000000000000..3b7817cebeeba4
--- /dev/null
+++ b/src/libraries/Microsoft.Extensions.Logging.Abstractions/gen/LoggerMessageGenerator.Roslyn4.0.cs
@@ -0,0 +1,52 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Collections.Generic;
+using System.Collections.Immutable;
+using System.Linq;
+using System.Text;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.Text;
+
+[assembly: System.Resources.NeutralResourcesLanguage("en-us")]
+
+namespace Microsoft.Extensions.Logging.Generators
+{
+ [Generator]
+ public partial class LoggerMessageGenerator : IIncrementalGenerator
+ {
+ public void Initialize(IncrementalGeneratorInitializationContext context)
+ {
+ IncrementalValuesProvider classDeclarations = context.SyntaxProvider
+ .CreateSyntaxProvider(static (s, _) => Parser.IsSyntaxTargetForGeneration(s), static (ctx, _) => Parser.GetSemanticTargetForGeneration(ctx))
+ .Where(static m => m is not null);
+
+ IncrementalValueProvider<(Compilation, ImmutableArray)> compilationAndClasses =
+ context.CompilationProvider.Combine(classDeclarations.Collect());
+
+ context.RegisterSourceOutput(compilationAndClasses, static (spc, source) => Execute(source.Item1, source.Item2, spc));
+ }
+
+ private static void Execute(Compilation compilation, ImmutableArray classes, SourceProductionContext context)
+ {
+ if (classes.IsDefaultOrEmpty)
+ {
+ // nothing to do yet
+ return;
+ }
+
+ IEnumerable distinctClasses = classes.Distinct();
+
+ var p = new Parser(compilation, context.ReportDiagnostic, context.CancellationToken);
+ IReadOnlyList logClasses = p.GetLogClasses(distinctClasses);
+ if (logClasses.Count > 0)
+ {
+ var e = new Emitter();
+ string result = e.Emit(logClasses, context.CancellationToken);
+
+ context.AddSource("LoggerMessage.g.cs", SourceText.From(result, Encoding.UTF8));
+ }
+ }
+ }
+}
diff --git a/src/libraries/Microsoft.Extensions.Logging.Abstractions/gen/Microsoft.Extensions.Logging.Generators.Roslyn3.11.csproj b/src/libraries/Microsoft.Extensions.Logging.Abstractions/gen/Microsoft.Extensions.Logging.Generators.Roslyn3.11.csproj
new file mode 100644
index 00000000000000..4a0f7955215914
--- /dev/null
+++ b/src/libraries/Microsoft.Extensions.Logging.Abstractions/gen/Microsoft.Extensions.Logging.Generators.Roslyn3.11.csproj
@@ -0,0 +1,14 @@
+
+
+
+ 3.11
+ $(MicrosoftCodeAnalysisCSharpWorkspacesVersion_3_11)
+
+
+
+
+
+
+
+
+
diff --git a/src/libraries/Microsoft.Extensions.Logging.Abstractions/gen/Microsoft.Extensions.Logging.Generators.Roslyn4.0.csproj b/src/libraries/Microsoft.Extensions.Logging.Abstractions/gen/Microsoft.Extensions.Logging.Generators.Roslyn4.0.csproj
new file mode 100644
index 00000000000000..50e939c50b1985
--- /dev/null
+++ b/src/libraries/Microsoft.Extensions.Logging.Abstractions/gen/Microsoft.Extensions.Logging.Generators.Roslyn4.0.csproj
@@ -0,0 +1,15 @@
+
+
+
+ 4.0
+ $(MicrosoftCodeAnalysisCSharpWorkspacesVersion)
+ $(DefineConstants);ROSLYN4_0_OR_GREATER
+
+
+
+
+
+
+
+
+
diff --git a/src/libraries/Microsoft.Extensions.Logging.Abstractions/gen/Microsoft.Extensions.Logging.Generators.csproj b/src/libraries/Microsoft.Extensions.Logging.Abstractions/gen/Microsoft.Extensions.Logging.Generators.targets
similarity index 57%
rename from src/libraries/Microsoft.Extensions.Logging.Abstractions/gen/Microsoft.Extensions.Logging.Generators.csproj
rename to src/libraries/Microsoft.Extensions.Logging.Abstractions/gen/Microsoft.Extensions.Logging.Generators.targets
index 1531036a02e811..77a182fa4649aa 100644
--- a/src/libraries/Microsoft.Extensions.Logging.Abstractions/gen/Microsoft.Extensions.Logging.Generators.csproj
+++ b/src/libraries/Microsoft.Extensions.Logging.Abstractions/gen/Microsoft.Extensions.Logging.Generators.targets
@@ -1,7 +1,11 @@
-
+
netstandard2.0
+ $(MSBuildThisFileName)
+ $(MSBuildThisFileName)
+ SR
+ FxResources.$(RootNamespace).$(StringResourcesClassName)
enable
true
false
@@ -12,8 +16,12 @@
-
+
+
+
+
+
diff --git a/src/libraries/Microsoft.Extensions.Logging.Abstractions/src/Microsoft.Extensions.Logging.Abstractions.csproj b/src/libraries/Microsoft.Extensions.Logging.Abstractions/src/Microsoft.Extensions.Logging.Abstractions.csproj
index 71e35b67179fa7..77092726df74cb 100644
--- a/src/libraries/Microsoft.Extensions.Logging.Abstractions/src/Microsoft.Extensions.Logging.Abstractions.csproj
+++ b/src/libraries/Microsoft.Extensions.Logging.Abstractions/src/Microsoft.Extensions.Logging.Abstractions.csproj
@@ -17,6 +17,8 @@ Microsoft.Extensions.Logging.LogLevel
Microsoft.Extensions.Logging.Logger<T>
Microsoft.Extensions.Logging.LoggerMessage
Microsoft.Extensions.Logging.Abstractions.NullLogger
+ true
+ 1
@@ -30,13 +32,15 @@ Microsoft.Extensions.Logging.Abstractions.NullLogger
Link="Common\System\Text\ValueStringBuilder.cs" />
-
+
-
-
+
+
+
diff --git a/src/libraries/Microsoft.Extensions.Logging.Abstractions/tests/Microsoft.Extensions.Logging.Generators.Tests/Baselines/TestWithDefaultValues.generated.txt b/src/libraries/Microsoft.Extensions.Logging.Abstractions/tests/Microsoft.Extensions.Logging.Generators.Tests/Baselines/TestWithDefaultValues.generated.txt
index c61da37d27bba4..f4747ef679f83c 100644
--- a/src/libraries/Microsoft.Extensions.Logging.Abstractions/tests/Microsoft.Extensions.Logging.Generators.Tests/Baselines/TestWithDefaultValues.generated.txt
+++ b/src/libraries/Microsoft.Extensions.Logging.Abstractions/tests/Microsoft.Extensions.Logging.Generators.Tests/Baselines/TestWithDefaultValues.generated.txt
@@ -5,7 +5,7 @@ namespace Microsoft.Extensions.Logging.Generators.Tests.TestClasses
{
partial class TestWithDefaultValues
{
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Extensions.Logging.Generators", "6.0.0.0")]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Extensions.Logging.Generators", "%VERSION%")]
private readonly struct __M0Struct : global::System.Collections.Generic.IReadOnlyList>
{
@@ -40,7 +40,7 @@ namespace Microsoft.Extensions.Logging.Generators.Tests.TestClasses
global::System.Collections.IEnumerator global::System.Collections.IEnumerable.GetEnumerator() => GetEnumerator();
}
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Extensions.Logging.Generators", "6.0.0.0")]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Extensions.Logging.Generators", "%VERSION%")]
public static partial void M0(global::Microsoft.Extensions.Logging.ILogger logger, global::Microsoft.Extensions.Logging.LogLevel level)
{
if (logger.IsEnabled(level))
@@ -54,4 +54,4 @@ namespace Microsoft.Extensions.Logging.Generators.Tests.TestClasses
}
}
}
-}
+}
\ No newline at end of file
diff --git a/src/libraries/Microsoft.Extensions.Logging.Abstractions/tests/Microsoft.Extensions.Logging.Generators.Tests/Baselines/TestWithDynamicLogLevel.generated.txt b/src/libraries/Microsoft.Extensions.Logging.Abstractions/tests/Microsoft.Extensions.Logging.Generators.Tests/Baselines/TestWithDynamicLogLevel.generated.txt
index 7a2026361b561b..1d1af4719fe40d 100644
--- a/src/libraries/Microsoft.Extensions.Logging.Abstractions/tests/Microsoft.Extensions.Logging.Generators.Tests/Baselines/TestWithDynamicLogLevel.generated.txt
+++ b/src/libraries/Microsoft.Extensions.Logging.Abstractions/tests/Microsoft.Extensions.Logging.Generators.Tests/Baselines/TestWithDynamicLogLevel.generated.txt
@@ -5,7 +5,7 @@ namespace Microsoft.Extensions.Logging.Generators.Tests.TestClasses
{
partial class TestWithDynamicLogLevel
{
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Extensions.Logging.Generators", "6.0.0.0")]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Extensions.Logging.Generators", "%VERSION%")]
private readonly struct __M9Struct : global::System.Collections.Generic.IReadOnlyList>
{
@@ -40,7 +40,7 @@ namespace Microsoft.Extensions.Logging.Generators.Tests.TestClasses
global::System.Collections.IEnumerator global::System.Collections.IEnumerable.GetEnumerator() => GetEnumerator();
}
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Extensions.Logging.Generators", "6.0.0.0")]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Extensions.Logging.Generators", "%VERSION%")]
public static partial void M9(global::Microsoft.Extensions.Logging.LogLevel level, global::Microsoft.Extensions.Logging.ILogger logger)
{
if (logger.IsEnabled(level))
diff --git a/src/libraries/Microsoft.Extensions.Logging.Abstractions/tests/Microsoft.Extensions.Logging.Generators.Tests/Baselines/TestWithMoreThan6Params.generated.txt b/src/libraries/Microsoft.Extensions.Logging.Abstractions/tests/Microsoft.Extensions.Logging.Generators.Tests/Baselines/TestWithMoreThan6Params.generated.txt
index 90455e122c1d42..3387ec2da1a327 100644
--- a/src/libraries/Microsoft.Extensions.Logging.Abstractions/tests/Microsoft.Extensions.Logging.Generators.Tests/Baselines/TestWithMoreThan6Params.generated.txt
+++ b/src/libraries/Microsoft.Extensions.Logging.Abstractions/tests/Microsoft.Extensions.Logging.Generators.Tests/Baselines/TestWithMoreThan6Params.generated.txt
@@ -5,7 +5,7 @@ namespace Microsoft.Extensions.Logging.Generators.Tests.TestClasses
{
partial class TestWithMoreThan6Params
{
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Extensions.Logging.Generators", "6.0.0.0")]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Extensions.Logging.Generators", "%VERSION%")]
private readonly struct __Method9Struct : global::System.Collections.Generic.IReadOnlyList>
{
private readonly global::System.Int32 _p1;
@@ -73,7 +73,7 @@ namespace Microsoft.Extensions.Logging.Generators.Tests.TestClasses
global::System.Collections.IEnumerator global::System.Collections.IEnumerable.GetEnumerator() => GetEnumerator();
}
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Extensions.Logging.Generators", "6.0.0.0")]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Extensions.Logging.Generators", "%VERSION%")]
public static partial void Method9(global::Microsoft.Extensions.Logging.ILogger logger, global::System.Int32 p1, global::System.Int32 p2, global::System.Int32 p3, global::System.Int32 p4, global::System.Int32 p5, global::System.Int32 p6, global::System.Collections.Generic.IEnumerable p7)
{
if (logger.IsEnabled(global::Microsoft.Extensions.Logging.LogLevel.Error))
@@ -88,7 +88,7 @@ namespace Microsoft.Extensions.Logging.Generators.Tests.TestClasses
}
}
}
-[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Extensions.Logging.Generators", "6.0.0.0")]
+[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Extensions.Logging.Generators", "%VERSION%")]
internal static class __LoggerMessageGenerator
{
public static string Enumerate(global::System.Collections.IEnumerable? enumerable)
diff --git a/src/libraries/Microsoft.Extensions.Logging.Abstractions/tests/Microsoft.Extensions.Logging.Generators.Tests/Baselines/TestWithNestedClass.generated.txt b/src/libraries/Microsoft.Extensions.Logging.Abstractions/tests/Microsoft.Extensions.Logging.Generators.Tests/Baselines/TestWithNestedClass.generated.txt
index e10a678aef24cf..07cd2a3aff4211 100644
--- a/src/libraries/Microsoft.Extensions.Logging.Abstractions/tests/Microsoft.Extensions.Logging.Generators.Tests/Baselines/TestWithNestedClass.generated.txt
+++ b/src/libraries/Microsoft.Extensions.Logging.Abstractions/tests/Microsoft.Extensions.Logging.Generators.Tests/Baselines/TestWithNestedClass.generated.txt
@@ -9,17 +9,17 @@ namespace Microsoft.Extensions.Logging.Generators.Tests.TestClasses.NestedNamesp
{
partial record NestedRecord
{
- partial class NestedClassTestsExtensions where T1 : Class1
+ partial class NestedClassTestsExtensions
{
partial class NestedMiddleParentClass
{
- partial class Nested where T2 : Class2
+ partial class Nested
{
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Extensions.Logging.Generators", "6.0.0.0")]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Extensions.Logging.Generators", "%VERSION%")]
private static readonly global::System.Action __M9Callback =
global::Microsoft.Extensions.Logging.LoggerMessage.Define(global::Microsoft.Extensions.Logging.LogLevel.Debug, new global::Microsoft.Extensions.Logging.EventId(9, nameof(M9)), "M9", new global::Microsoft.Extensions.Logging.LogDefineOptions() { SkipEnabledCheck = true });
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Extensions.Logging.Generators", "6.0.0.0")]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Extensions.Logging.Generators", "%VERSION%")]
public static partial void M9(global::Microsoft.Extensions.Logging.ILogger logger)
{
if (logger.IsEnabled(global::Microsoft.Extensions.Logging.LogLevel.Debug))
diff --git a/src/libraries/Microsoft.Extensions.Logging.Abstractions/tests/Microsoft.Extensions.Logging.Generators.Tests/Baselines/TestWithSkipEnabledCheck.generated.txt b/src/libraries/Microsoft.Extensions.Logging.Abstractions/tests/Microsoft.Extensions.Logging.Generators.Tests/Baselines/TestWithSkipEnabledCheck.generated.txt
index 6576bb4b394f1b..24575eb81bf458 100644
--- a/src/libraries/Microsoft.Extensions.Logging.Abstractions/tests/Microsoft.Extensions.Logging.Generators.Tests/Baselines/TestWithSkipEnabledCheck.generated.txt
+++ b/src/libraries/Microsoft.Extensions.Logging.Abstractions/tests/Microsoft.Extensions.Logging.Generators.Tests/Baselines/TestWithSkipEnabledCheck.generated.txt
@@ -5,11 +5,11 @@ namespace Microsoft.Extensions.Logging.Generators.Tests.TestClasses
{
partial class TestWithSkipEnabledCheck
{
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Extensions.Logging.Generators", "6.0.0.0")]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Extensions.Logging.Generators", "%VERSION%")]
private static readonly global::System.Action __M0Callback =
global::Microsoft.Extensions.Logging.LoggerMessage.Define(global::Microsoft.Extensions.Logging.LogLevel.Information, new global::Microsoft.Extensions.Logging.EventId(0, nameof(M0)), "Message: When using SkipEnabledCheck, the generated code skips logger.IsEnabled(logLevel) check before calling log. To be used when consumer has already guarded logger method in an IsEnabled check.", new global::Microsoft.Extensions.Logging.LogDefineOptions() { SkipEnabledCheck = true });
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Extensions.Logging.Generators", "6.0.0.0")]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Extensions.Logging.Generators", "%VERSION%")]
public static partial void M0(global::Microsoft.Extensions.Logging.ILogger logger)
{
__M0Callback(logger, null);
diff --git a/src/libraries/Microsoft.Extensions.Logging.Abstractions/tests/Microsoft.Extensions.Logging.Generators.Tests/Baselines/TestWithTwoParams.generated.txt b/src/libraries/Microsoft.Extensions.Logging.Abstractions/tests/Microsoft.Extensions.Logging.Generators.Tests/Baselines/TestWithTwoParams.generated.txt
index 5daee3ddd43a1e..d7c2482cdd9216 100644
--- a/src/libraries/Microsoft.Extensions.Logging.Abstractions/tests/Microsoft.Extensions.Logging.Generators.Tests/Baselines/TestWithTwoParams.generated.txt
+++ b/src/libraries/Microsoft.Extensions.Logging.Abstractions/tests/Microsoft.Extensions.Logging.Generators.Tests/Baselines/TestWithTwoParams.generated.txt
@@ -5,11 +5,11 @@ namespace Microsoft.Extensions.Logging.Generators.Tests.TestClasses
{
partial class TestWithTwoParams
{
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Extensions.Logging.Generators", "6.0.0.0")]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Extensions.Logging.Generators", "%VERSION%")]
private static readonly global::System.Action, global::System.Exception?> __M0Callback =
global::Microsoft.Extensions.Logging.LoggerMessage.Define>(global::Microsoft.Extensions.Logging.LogLevel.Error, new global::Microsoft.Extensions.Logging.EventId(0, nameof(M0)), "M0 {a1} {a2}", new global::Microsoft.Extensions.Logging.LogDefineOptions() { SkipEnabledCheck = true });
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Extensions.Logging.Generators", "6.0.0.0")]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Extensions.Logging.Generators", "%VERSION%")]
public static partial void M0(global::Microsoft.Extensions.Logging.ILogger logger, global::System.Int32 a1, global::System.Collections.Generic.IEnumerable a2)
{
if (logger.IsEnabled(global::Microsoft.Extensions.Logging.LogLevel.Error))
diff --git a/src/libraries/Microsoft.Extensions.Logging.Abstractions/tests/Microsoft.Extensions.Logging.Generators.Tests/CompilationHelper.cs b/src/libraries/Microsoft.Extensions.Logging.Abstractions/tests/Microsoft.Extensions.Logging.Generators.Tests/CompilationHelper.cs
new file mode 100644
index 00000000000000..59c82a5437147f
--- /dev/null
+++ b/src/libraries/Microsoft.Extensions.Logging.Abstractions/tests/Microsoft.Extensions.Logging.Generators.Tests/CompilationHelper.cs
@@ -0,0 +1,64 @@
+// 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 System.IO;
+using System.Reflection;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp;
+
+namespace Microsoft.Extensions.Logging.Generators.Tests
+{
+ public class CompilationHelper
+ {
+ public static Compilation CreateCompilation(
+ string source,
+ MetadataReference[]? additionalReferences = null,
+ string assemblyName = "TestAssembly")
+ {
+ string corelib = Assembly.GetAssembly(typeof(object))!.Location;
+ string runtimeDir = Path.GetDirectoryName(corelib)!;
+
+ var refs = new List();
+ refs.Add(MetadataReference.CreateFromFile(corelib));
+ refs.Add(MetadataReference.CreateFromFile(Path.Combine(runtimeDir, "netstandard.dll")));
+ refs.Add(MetadataReference.CreateFromFile(Path.Combine(runtimeDir, "System.Runtime.dll")));
+ refs.Add(MetadataReference.CreateFromFile(typeof(ILogger).Assembly.Location));
+ refs.Add(MetadataReference.CreateFromFile(typeof(LoggerMessageAttribute).Assembly.Location));
+
+ if (additionalReferences != null)
+ {
+ foreach (MetadataReference reference in additionalReferences)
+ {
+ refs.Add(reference);
+ }
+ }
+
+ CSharpParseOptions options = CSharpParseOptions.Default;
+
+#if ROSLYN4_0_OR_GREATER
+ // workaround https://github.com/dotnet/roslyn/pull/55866. We can remove "LangVersion=Preview" when we get a Roslyn build with that change.
+ options = options.WithLanguageVersion(LanguageVersion.Preview);
+#endif
+
+ return CSharpCompilation.Create(
+ assemblyName,
+ syntaxTrees: new[] { CSharpSyntaxTree.ParseText(source, options) },
+ references: refs.ToArray(),
+ options: new CSharpCompilationOptions(OutputKind.DynamicallyLinkedLibrary)
+ );
+ }
+
+ public static byte[] CreateAssemblyImage(Compilation compilation)
+ {
+ MemoryStream ms = new MemoryStream();
+ var emitResult = compilation.Emit(ms);
+ if (!emitResult.Success)
+ {
+ throw new InvalidOperationException();
+ }
+ return ms.ToArray();
+ }
+ }
+}
diff --git a/src/libraries/Microsoft.Extensions.Logging.Abstractions/tests/Microsoft.Extensions.Logging.Generators.Tests/LoggerMessageGeneratedCodeTests.cs b/src/libraries/Microsoft.Extensions.Logging.Abstractions/tests/Microsoft.Extensions.Logging.Generators.Tests/LoggerMessageGeneratedCodeTests.cs
index d55bf4a8028d52..3b0650309a0179 100644
--- a/src/libraries/Microsoft.Extensions.Logging.Abstractions/tests/Microsoft.Extensions.Logging.Generators.Tests/LoggerMessageGeneratedCodeTests.cs
+++ b/src/libraries/Microsoft.Extensions.Logging.Abstractions/tests/Microsoft.Extensions.Logging.Generators.Tests/LoggerMessageGeneratedCodeTests.cs
@@ -3,8 +3,12 @@
using System;
using System.Collections.Generic;
+using Microsoft.Extensions.Logging.Abstractions;
using Microsoft.Extensions.Logging.Generators.Tests.TestClasses;
+using Microsoft.Extensions.Logging.Generators.Tests.TestClasses.UsesConstraintInAnotherNamespace;
using Xunit;
+using NamespaceForABC;
+using ConstraintInAnotherNamespace;
namespace Microsoft.Extensions.Logging.Generators.Tests
{
@@ -410,6 +414,71 @@ public void SkipEnabledCheckTests()
Assert.Equal(1, logger.CallCount);
Assert.Equal("LoggerMethodWithTrueSkipEnabledCheck", logger.LastEventId.Name);
}
+ private struct MyStruct { }
+
+ [Fact]
+ public void ConstraintsTests()
+ {
+ var logger = new MockLogger();
+
+ var printer = new MessagePrinter();
+ logger.Reset();
+ printer.Print(logger, new Message() { Text = "Hello" });
+ Assert.Equal(LogLevel.Information, logger.LastLogLevel);
+ Assert.Null(logger.LastException);
+ Assert.Equal("The message is Hello.", logger.LastFormattedString);
+ Assert.Equal(1, logger.CallCount);
+
+ var printer2 = new MessagePrinterHasConstraintOnLogClassAndLogMethod();
+ logger.Reset();
+ printer2.Print(logger, new Message() { Text = "Hello" });
+ Assert.Equal(LogLevel.Information, logger.LastLogLevel);
+ Assert.Null(logger.LastException);
+ Assert.Equal("The message is `Hello`.", logger.LastFormattedString);
+ Assert.Equal(1, logger.CallCount);
+
+ logger.Reset();
+ ConstraintsTestExtensions
diff --git a/src/libraries/Native/AnyOS/zlib/pal_zlib.c b/src/libraries/Native/AnyOS/zlib/pal_zlib.c
index aa4dcdca8a29e8..4d0b05c6629fa5 100644
--- a/src/libraries/Native/AnyOS/zlib/pal_zlib.c
+++ b/src/libraries/Native/AnyOS/zlib/pal_zlib.c
@@ -7,6 +7,9 @@
#ifdef _WIN32
#define c_static_assert(e) static_assert((e),"")
+#endif
+
+#if defined(_WIN32) || defined(__EMSCRIPTEN__)
#include "../../Windows/System.IO.Compression.Native/zlib/zlib.h"
#else
#include "pal_utilities.h"
diff --git a/src/libraries/Native/Unix/CMakeLists.txt b/src/libraries/Native/Unix/CMakeLists.txt
index 31cea57a629380..6fae902369c0e8 100644
--- a/src/libraries/Native/Unix/CMakeLists.txt
+++ b/src/libraries/Native/Unix/CMakeLists.txt
@@ -36,6 +36,8 @@ add_compile_options(-Wno-cast-align)
add_compile_options(-Wno-typedef-redefinition)
add_compile_options(-Wno-c11-extensions)
add_compile_options(-Wno-unknown-pragmas)
+add_compile_options(-Wno-unknown-warning-option)
+add_compile_options(-Wno-unused-but-set-variable)
check_c_compiler_flag(-Wimplicit-fallthrough COMPILER_SUPPORTS_W_IMPLICIT_FALLTHROUGH)
if (COMPILER_SUPPORTS_W_IMPLICIT_FALLTHROUGH)
@@ -48,6 +50,7 @@ add_compile_options(-g)
if(CMAKE_C_COMPILER_ID STREQUAL Clang)
add_compile_options(-Wthread-safety)
add_compile_options(-Wno-thread-safety-analysis)
+ add_compile_options(-Wno-reserved-identifier)
elseif(CMAKE_C_COMPILER_ID STREQUAL GNU)
add_compile_options(-Wno-stringop-truncation)
endif()
diff --git a/src/libraries/Native/Unix/Common/pal_config.h.in b/src/libraries/Native/Unix/Common/pal_config.h.in
index 9a02610534101b..8d0d191d1c73d6 100644
--- a/src/libraries/Native/Unix/Common/pal_config.h.in
+++ b/src/libraries/Native/Unix/Common/pal_config.h.in
@@ -12,6 +12,7 @@
#cmakedefine01 HAVE_F_FULLFSYNC
#cmakedefine01 HAVE_O_CLOEXEC
#cmakedefine01 HAVE_GETIFADDRS
+#cmakedefine01 HAVE_IFADDRS
#cmakedefine01 HAVE_UTSNAME_DOMAINNAME
#cmakedefine01 HAVE_STAT64
#cmakedefine01 HAVE_FORK
@@ -36,8 +37,7 @@
#cmakedefine01 HAVE_STRLCAT
#cmakedefine01 HAVE_SHM_OPEN_THAT_WORKS_WELL_ENOUGH_WITH_MMAP
#cmakedefine01 HAVE_POSIX_ADVISE
-#cmakedefine01 HAVE_POSIX_FALLOCATE
-#cmakedefine01 HAVE_POSIX_FALLOCATE64
+#cmakedefine01 HAVE_FALLOCATE
#cmakedefine01 HAVE_PREADV
#cmakedefine01 HAVE_PWRITEV
#cmakedefine01 PRIORITY_REQUIRES_INT_WHO
@@ -78,6 +78,10 @@
#cmakedefine01 HAVE_NETINET_IP_VAR_H
#cmakedefine01 HAVE_NETINET_ICMP_VAR_H
#cmakedefine01 HAVE_IOS_NET_ROUTE_H
+#cmakedefine01 HAVE_IOS_NETINET_IP_VAR_H
+#cmakedefine01 HAVE_IOS_NETINET_ICMP_VAR_H
+#cmakedefine01 HAVE_IOS_NETINET_TCPFSM_H
+#cmakedefine01 HAVE_IOS_NETINET_UDP_VAR_H
#cmakedefine01 HAVE_RT_MSGHDR
#cmakedefine01 HAVE_RT_MSGHDR2
#cmakedefine01 HAVE_IF_MSGHDR2
@@ -88,6 +92,7 @@
#cmakedefine01 HAVE_NET_IF_ARP_H
#cmakedefine01 HAVE_SYS_MNTENT_H
#cmakedefine01 HAVE_NET_IFMEDIA_H
+#cmakedefine01 HAVE_IOS_NET_IFMEDIA_H
#cmakedefine01 HAVE_LINUX_RTNETLINK_H
#cmakedefine01 HAVE_LINUX_CAN_H
#cmakedefine01 HAVE_GETDOMAINNAME_SIZET
diff --git a/src/libraries/Native/Unix/System.Globalization.Native/pal_icushim_internal.h b/src/libraries/Native/Unix/System.Globalization.Native/pal_icushim_internal.h
index 92ded52d687245..1ddaff5594aad3 100644
--- a/src/libraries/Native/Unix/System.Globalization.Native/pal_icushim_internal.h
+++ b/src/libraries/Native/Unix/System.Globalization.Native/pal_icushim_internal.h
@@ -73,8 +73,8 @@ U_CAPI int32_t U_EXPORT2 ucal_getWindowsTimeZoneID(const UChar* id, int32_t len,
PER_FUNCTION_BLOCK(u_tolower, libicuuc, true) \
PER_FUNCTION_BLOCK(u_toupper, libicuuc, true) \
PER_FUNCTION_BLOCK(u_uastrncpy, libicuuc, true) \
- PER_FUNCTION_BLOCK(ubrk_close, libicui18n, true) \
- PER_FUNCTION_BLOCK(ubrk_openRules, libicui18n, true) \
+ PER_FUNCTION_BLOCK(ubrk_close, libicuuc, true) \
+ PER_FUNCTION_BLOCK(ubrk_openRules, libicuuc, true) \
PER_FUNCTION_BLOCK(ucal_add, libicui18n, true) \
PER_FUNCTION_BLOCK(ucal_close, libicui18n, true) \
PER_FUNCTION_BLOCK(ucal_get, libicui18n, true) \
diff --git a/src/libraries/Native/Unix/System.IO.Compression.Native/CMakeLists.txt b/src/libraries/Native/Unix/System.IO.Compression.Native/CMakeLists.txt
index f68e1acef69b00..89c20051c895cd 100644
--- a/src/libraries/Native/Unix/System.IO.Compression.Native/CMakeLists.txt
+++ b/src/libraries/Native/Unix/System.IO.Compression.Native/CMakeLists.txt
@@ -1,9 +1,5 @@
project(System.IO.Compression.Native C)
-if (CLR_CMAKE_TARGET_BROWSER)
- add_definitions(-s USE_ZLIB)
-endif()
-
include(${CMAKE_CURRENT_LIST_DIR}/extra_libs.cmake)
set(NATIVE_LIBS_EXTRA)
@@ -13,7 +9,21 @@ set(NATIVECOMPRESSION_SOURCES
../../AnyOS/zlib/pal_zlib.c
)
-if (NOT CLR_CMAKE_TARGET_BROWSER)
+if (CLR_CMAKE_TARGET_BROWSER)
+ set (NATIVECOMPRESSION_SOURCES
+ ${NATIVECOMPRESSION_SOURCES}
+ ../../Windows/System.IO.Compression.Native/zlib/adler32.c
+ ../../Windows/System.IO.Compression.Native/zlib/compress.c
+ ../../Windows/System.IO.Compression.Native/zlib/crc32.c
+ ../../Windows/System.IO.Compression.Native/zlib/deflate.c
+ ../../Windows/System.IO.Compression.Native/zlib/inffast.c
+ ../../Windows/System.IO.Compression.Native/zlib/inflate.c
+ ../../Windows/System.IO.Compression.Native/zlib/inftrees.c
+ ../../Windows/System.IO.Compression.Native/zlib/trees.c
+ ../../Windows/System.IO.Compression.Native/zlib/zutil.c
+ )
+ set_source_files_properties(${NATIVECOMPRESSION_SOURCES} PROPERTIES COMPILE_FLAGS -Wno-implicit-fallthrough)
+else()
#Include Brotli include files
include_directories("../../AnyOS/brotli/include")
diff --git a/src/libraries/Native/Unix/System.Native/CMakeLists.txt b/src/libraries/Native/Unix/System.Native/CMakeLists.txt
index a28952750b3ef9..188ca5fc6bde86 100644
--- a/src/libraries/Native/Unix/System.Native/CMakeLists.txt
+++ b/src/libraries/Native/Unix/System.Native/CMakeLists.txt
@@ -40,6 +40,12 @@ else()
list (APPEND NATIVE_SOURCES pal_autoreleasepool.c)
endif()
+if (CLR_CMAKE_TARGET_MACCATALYST OR CLR_CMAKE_TARGET_IOS OR CLR_CMAKE_TARGET_TVOS)
+ list (APPEND NATIVE_SOURCES pal_environment.m)
+else()
+ list (APPEND NATIVE_SOURCES pal_environment.c)
+endif()
+
if (CLR_CMAKE_TARGET_MACCATALYST OR CLR_CMAKE_TARGET_IOS OR CLR_CMAKE_TARGET_TVOS)
set(NATIVE_SOURCES ${NATIVE_SOURCES}
pal_log.m
diff --git a/src/libraries/Native/Unix/System.Native/entrypoints.c b/src/libraries/Native/Unix/System.Native/entrypoints.c
index c8b678ec08340b..702ead88e6d7e2 100644
--- a/src/libraries/Native/Unix/System.Native/entrypoints.c
+++ b/src/libraries/Native/Unix/System.Native/entrypoints.c
@@ -7,6 +7,7 @@
#include "pal_autoreleasepool.h"
#include "pal_console.h"
#include "pal_datetime.h"
+#include "pal_environment.h"
#include "pal_errno.h"
#include "pal_interfaceaddresses.h"
#include "pal_io.h"
@@ -91,7 +92,7 @@ static const Entry s_sysNative[] =
DllImportEntry(SystemNative_FTruncate)
DllImportEntry(SystemNative_Poll)
DllImportEntry(SystemNative_PosixFAdvise)
- DllImportEntry(SystemNative_PosixFAllocate)
+ DllImportEntry(SystemNative_FAllocate)
DllImportEntry(SystemNative_Read)
DllImportEntry(SystemNative_ReadLink)
DllImportEntry(SystemNative_Rename)
@@ -218,6 +219,7 @@ static const Entry s_sysNative[] =
DllImportEntry(SystemNative_GetOSArchitecture)
DllImportEntry(SystemNative_GetProcessArchitecture)
DllImportEntry(SystemNative_SearchPath)
+ DllImportEntry(SystemNative_SearchPath_TempDirectory)
DllImportEntry(SystemNative_RegisterForSigChld)
DllImportEntry(SystemNative_SetDelayedSigChildConsoleConfigurationHandler)
DllImportEntry(SystemNative_SetTerminalInvalidationHandler)
@@ -257,6 +259,9 @@ static const Entry s_sysNative[] =
DllImportEntry(SystemNative_SetPosixSignalHandler)
DllImportEntry(SystemNative_GetPlatformSignalNumber)
DllImportEntry(SystemNative_GetGroups)
+ DllImportEntry(SystemNative_GetEnv)
+ DllImportEntry(SystemNative_GetEnviron)
+ DllImportEntry(SystemNative_FreeEnviron)
};
EXTERN_C const void* SystemResolveDllImport(const char* name);
diff --git a/src/libraries/Native/Unix/System.Native/ios/net/if_media.h b/src/libraries/Native/Unix/System.Native/ios/net/if_media.h
new file mode 100644
index 00000000000000..e7e1a838d420fc
--- /dev/null
+++ b/src/libraries/Native/Unix/System.Native/ios/net/if_media.h
@@ -0,0 +1,589 @@
+/*
+ * Copyright (c) 2000-2019 Apple Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ *
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ *
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ *
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+/* $NetBSD: if_media.h,v 1.3 1997/03/26 01:19:27 thorpej Exp $ */
+/* $FreeBSD: src/sys/net/if_media.h,v 1.9.2.1 2001/07/04 00:12:38 brooks Exp $ */
+
+/*
+ * Copyright (c) 1997
+ * Jonathan Stone and Jason R. Thorpe. All rights reserved.
+ *
+ * This software is derived from information provided by Matt Thomas.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ * must display the following acknowledgement:
+ * This product includes software developed by Jonathan Stone
+ * and Jason R. Thorpe for the NetBSD Project.
+ * 4. The names of the authors may not be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#ifndef _NET_IF_MEDIA_H_
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wreserved-id-macro"
+#define _NET_IF_MEDIA_H_
+#pragma clang diagnostic pop
+#ifndef DRIVERKIT
+#include
+#endif /* DRIVERKIT */
+
+/*
+ * Prototypes and definitions for BSD/OS-compatible network interface
+ * media selection.
+ *
+ * Where it is safe to do so, this code strays slightly from the BSD/OS
+ * design. Software which uses the API (device drivers, basically)
+ * shouldn't notice any difference.
+ *
+ * Many thanks to Matt Thomas for providing the information necessary
+ * to implement this interface.
+ */
+
+#ifdef KERNEL_PRIVATE
+/* sigh; some modules are lazy and thus rely on this */
+#include
+#endif /* KERNEL_PRIVATE */
+
+/*
+ * if_media Options word:
+ * Bits Use
+ * ---- -------
+ * 0-4 Media variant
+ * 5-7 Media type
+ * 8-15 Type specific options
+ * 16-19 Extended media variant bits
+ * 20-27 Shared (global) options
+ * 28-31 Instance
+ */
+
+/*
+ * Ethernet
+ *
+ * In order to use more than 31 subtypes, Ethernet uses the extended media
+ * variant bits
+ *
+ * The extended media variant bits are not backward compatible so they
+ * must not be used by kernel extensions like ifnet and drivers that
+ * are to be deployed on older system versions
+ */
+#define IFM_X(x) IFM_X_SUBTYPE(x) /* internal shorthand */
+
+#define IFM_ETHER 0x00000020
+#define IFM_10_T 3 /* 10BaseT - RJ45 */
+#define IFM_10_2 4 /* 10Base2 - Thinnet */
+#define IFM_10_5 5 /* 10Base5 - AUI */
+#define IFM_100_TX 6 /* 100BaseTX - RJ45 */
+#define IFM_100_FX 7 /* 100BaseFX - Fiber */
+#define IFM_100_T4 8 /* 100BaseT4 - 4 pair cat 3 */
+#define IFM_100_VG 9 /* 100VG-AnyLAN */
+#define IFM_100_T2 10 /* 100BaseT2 */
+#define IFM_1000_SX 11 /* 1000BaseSX - multi-mode fiber */
+#define IFM_10_STP 12 /* 10BaseT over shielded TP */
+#define IFM_10_FL 13 /* 10baseFL - Fiber */
+#define IFM_1000_LX 14 /* 1000baseLX - single-mode fiber */
+#define IFM_1000_CX 15 /* 1000baseCX - 150ohm STP */
+#define IFM_1000_T 16 /* 1000baseT - 4 pair cat 5 */
+#ifdef PRIVATE
+#define IFM_1000_TX IFM_1000_T /* For compatibility */
+#endif /* PRIVATE */
+#define IFM_HPNA_1 17 /* HomePNA 1.0 (1Mb/s) */
+#define IFM_10G_SR 18 /* 10GbaseSR - multi-mode fiber */
+#define IFM_10G_LR 19 /* 10GbaseLR - single-mode fiber */
+#define IFM_10G_CX4 20 /* 10GbaseCX4 - copper */
+#define IFM_10G_T 21 /* 10GbaseT - 4 pair cat 6 */
+#define IFM_2500_T 22 /* 2500baseT - 4 pair cat 5 */
+#define IFM_5000_T 23 /* 5000baseT - 4 pair cat 5 */
+#define IFM_1000_CX_SGMII 24 /* 1000Base-CX-SGMII */
+#define IFM_1000_KX 25 /* 1000Base-KX backplane */
+#define IFM_10G_KX4 26 /* 10GBase-KX4 backplane */
+#define IFM_10G_KR 27 /* 10GBase-KR backplane */
+#define IFM_10G_CR1 28 /* 10GBase-CR1 Twinax splitter */
+#define IFM_10G_ER 29 /* 10GBase-ER */
+#define IFM_20G_KR2 30 /* 20GBase-KR2 backplane */
+#define IFM_OTHER 31 /* Other: one of the following */
+
+/* following types are not visible to old binaries using the low bits of IFM_TMASK */
+#define IFM_2500_SX IFM_X(32) /* 2500BaseSX - multi-mode fiber */
+#define IFM_10G_TWINAX IFM_X(33) /* 10GBase Twinax copper */
+#define IFM_10G_TWINAX_LONG IFM_X(34) /* 10GBase Twinax Long copper */
+#define IFM_10G_LRM IFM_X(35) /* 10GBase-LRM 850nm Multi-mode */
+#define IFM_2500_KX IFM_X(36) /* 2500Base-KX backplane */
+#define IFM_40G_CR4 IFM_X(37) /* 40GBase-CR4 */
+#define IFM_40G_SR4 IFM_X(38) /* 40GBase-SR4 */
+#define IFM_50G_PCIE IFM_X(39) /* 50G Ethernet over PCIE */
+#define IFM_25G_PCIE IFM_X(40) /* 25G Ethernet over PCIE */
+#define IFM_1000_SGMII IFM_X(41) /* 1G media interface */
+#define IFM_10G_SFI IFM_X(42) /* 10G media interface */
+#define IFM_40G_XLPPI IFM_X(43) /* 40G media interface */
+#define IFM_40G_LR4 IFM_X(44) /* 40GBase-LR4 */
+#define IFM_40G_KR4 IFM_X(45) /* 40GBase-KR4 */
+#define IFM_100G_CR4 IFM_X(47) /* 100GBase-CR4 */
+#define IFM_100G_SR4 IFM_X(48) /* 100GBase-SR4 */
+#define IFM_100G_KR4 IFM_X(49) /* 100GBase-KR4 */
+#define IFM_100G_LR4 IFM_X(50) /* 100GBase-LR4 */
+#define IFM_56G_R4 IFM_X(51) /* 56GBase-R4 */
+#define IFM_100_T IFM_X(52) /* 100BaseT - RJ45 */
+#define IFM_25G_CR IFM_X(53) /* 25GBase-CR */
+#define IFM_25G_KR IFM_X(54) /* 25GBase-KR */
+#define IFM_25G_SR IFM_X(55) /* 25GBase-SR */
+#define IFM_50G_CR2 IFM_X(56) /* 50GBase-CR2 */
+#define IFM_50G_KR2 IFM_X(57) /* 50GBase-KR2 */
+#define IFM_25G_LR IFM_X(58) /* 25GBase-LR */
+#define IFM_10G_AOC IFM_X(59) /* 10G active optical cable */
+#define IFM_25G_ACC IFM_X(60) /* 25G active copper cable */
+#define IFM_25G_AOC IFM_X(61) /* 25G active optical cable */
+#define IFM_100_SGMII IFM_X(62) /* 100M media interface */
+#define IFM_2500_X IFM_X(63) /* 2500BaseX */
+#define IFM_5000_KR IFM_X(64) /* 5GBase-KR backplane */
+#define IFM_25G_T IFM_X(65) /* 25GBase-T - RJ45 */
+#define IFM_25G_CR_S IFM_X(66) /* 25GBase-CR (short) */
+#define IFM_25G_CR1 IFM_X(67) /* 25GBase-CR1 DA cable */
+#define IFM_25G_KR_S IFM_X(68) /* 25GBase-KR (short) */
+#define IFM_5000_KR_S IFM_X(69) /* 5GBase-KR backplane (short) */
+#define IFM_5000_KR1 IFM_X(70) /* 5GBase-KR backplane */
+#define IFM_25G_AUI IFM_X(71) /* 25G-AUI-C2C (chip to chip) */
+#define IFM_40G_XLAUI IFM_X(72) /* 40G-XLAUI */
+#define IFM_40G_XLAUI_AC IFM_X(73) /* 40G active copper/optical */
+#define IFM_40G_ER4 IFM_X(74) /* 40GBase-ER4 */
+#define IFM_50G_SR2 IFM_X(75) /* 50GBase-SR2 */
+#define IFM_50G_LR2 IFM_X(76) /* 50GBase-LR2 */
+#define IFM_50G_LAUI2_AC IFM_X(77) /* 50G active copper/optical */
+#define IFM_50G_LAUI2 IFM_X(78) /* 50G-LAUI2 */
+#define IFM_50G_AUI2_AC IFM_X(79) /* 50G active copper/optical */
+#define IFM_50G_AUI2 IFM_X(80) /* 50G-AUI2 */
+#define IFM_50G_CP IFM_X(81) /* 50GBase-CP */
+#define IFM_50G_SR IFM_X(82) /* 50GBase-SR */
+#define IFM_50G_LR IFM_X(83) /* 50GBase-LR */
+#define IFM_50G_FR IFM_X(84) /* 50GBase-FR */
+#define IFM_50G_KR_PAM4 IFM_X(85) /* 50GBase-KR PAM4 */
+#define IFM_25G_KR1 IFM_X(86) /* 25GBase-KR1 */
+#define IFM_50G_AUI1_AC IFM_X(87) /* 50G active copper/optical */
+#define IFM_50G_AUI1 IFM_X(88) /* 50G-AUI1 */
+#define IFM_100G_CAUI4_AC IFM_X(89) /* 100G-CAUI4 active copper/optical */
+#define IFM_100G_CAUI4 IFM_X(90) /* 100G-CAUI4 */
+#define IFM_100G_AUI4_AC IFM_X(91) /* 100G-AUI4 active copper/optical */
+#define IFM_100G_AUI4 IFM_X(92) /* 100G-AUI4 */
+#define IFM_100G_CR_PAM4 IFM_X(93) /* 100GBase-CR PAM4 */
+#define IFM_100G_KR_PAM4 IFM_X(94) /* 100GBase-CR PAM4 */
+#define IFM_100G_CP2 IFM_X(95) /* 100GBase-CP2 */
+#define IFM_100G_SR2 IFM_X(96) /* 100GBase-SR2 */
+#define IFM_100G_DR IFM_X(97) /* 100GBase-DR */
+#define IFM_100G_KR2_PAM4 IFM_X(98) /* 100GBase-KR2 PAM4 */
+#define IFM_100G_CAUI2_AC IFM_X(99) /* 100G-CAUI2 active copper/optical */
+#define IFM_100G_CAUI2 IFM_X(100) /* 100G-CAUI2 */
+#define IFM_100G_AUI2_AC IFM_X(101) /* 100G-AUI2 active copper/optical */
+#define IFM_100G_AUI2 IFM_X(102) /* 100G-AUI2 */
+#define IFM_200G_CR4_PAM4 IFM_X(103) /* 200GBase-CR4 PAM4 */
+#define IFM_200G_SR4 IFM_X(104) /* 200GBase-SR4 */
+#define IFM_200G_FR4 IFM_X(105) /* 200GBase-FR4 */
+#define IFM_200G_LR4 IFM_X(106) /* 200GBase-LR4 */
+#define IFM_200G_DR4 IFM_X(107) /* 200GBase-DR4 */
+#define IFM_200G_KR4_PAM4 IFM_X(108) /* 200GBase-KR4 PAM4 */
+#define IFM_200G_AUI4_AC IFM_X(109) /* 200G-AUI4 active copper/optical */
+#define IFM_200G_AUI4 IFM_X(110) /* 200G-AUI4 */
+#define IFM_200G_AUI8_AC IFM_X(111) /* 200G-AUI8 active copper/optical */
+#define IFM_200G_AUI8 IFM_X(112) /* 200G-AUI8 */
+#define IFM_400G_FR8 IFM_X(113) /* 400GBase-FR8 */
+#define IFM_400G_LR8 IFM_X(114) /* 400GBase-LR8 */
+#define IFM_400G_DR4 IFM_X(115) /* 400GBase-DR4 */
+#define IFM_400G_AUI8_AC IFM_X(116) /* 400G-AUI8 active copper/optical */
+#define IFM_400G_AUI8 IFM_X(117) /* 400G-AUI8 */
+
+/*
+ * Token ring
+ */
+#define IFM_TOKEN 0x00000040
+#define IFM_TOK_STP4 3 /* Shielded twisted pair 4m - DB9 */
+#define IFM_TOK_STP16 4 /* Shielded twisted pair 16m - DB9 */
+#define IFM_TOK_UTP4 5 /* Unshielded twisted pair 4m - RJ45 */
+#define IFM_TOK_UTP16 6 /* Unshielded twisted pair 16m - RJ45 */
+#define IFM_TOK_STP100 7 /* Shielded twisted pair 100m - DB9 */
+#define IFM_TOK_UTP100 8 /* Unshielded twisted pair 100m - RJ45 */
+#define IFM_TOK_ETR 0x00000200 /* Early token release */
+#define IFM_TOK_SRCRT 0x00000400 /* Enable source routing features */
+#define IFM_TOK_ALLR 0x00000800 /* All routes / Single route bcast */
+#define IFM_TOK_DTR 0x00002000 /* Dedicated token ring */
+#define IFM_TOK_CLASSIC 0x00004000 /* Classic token ring */
+#define IFM_TOK_AUTO 0x00008000 /* Automatic Dedicate/Classic token ring */
+
+/*
+ * FDDI
+ */
+#define IFM_FDDI 0x00000060
+#define IFM_FDDI_SMF 3 /* Single-mode fiber */
+#define IFM_FDDI_MMF 4 /* Multi-mode fiber */
+#define IFM_FDDI_UTP 5 /* CDDI / UTP */
+#define IFM_FDDI_DA 0x00000100 /* Dual attach / single attach */
+
+/*
+ * IEEE 802.11 Wireless
+ */
+#define IFM_IEEE80211 0x00000080
+#define IFM_IEEE80211_FH1 3 /* Frequency Hopping 1Mbps */
+#define IFM_IEEE80211_FH2 4 /* Frequency Hopping 2Mbps */
+#define IFM_IEEE80211_DS2 5 /* Direct Sequence 2Mbps */
+#define IFM_IEEE80211_DS5 6 /* Direct Sequence 5Mbps*/
+#define IFM_IEEE80211_DS11 7 /* Direct Sequence 11Mbps*/
+#define IFM_IEEE80211_DS1 8 /* Direct Sequence 1Mbps */
+#define IFM_IEEE80211_DS22 9 /* Direct Sequence 22Mbps */
+#define IFM_IEEE80211_ADHOC 0x00000100 /* Operate in Adhoc mode */
+
+/*
+ * Shared media sub-types
+ */
+#define IFM_AUTO 0 /* Autoselect best media */
+#define IFM_MANUAL 1 /* Jumper/dipswitch selects media */
+#define IFM_NONE 2 /* Deselect all media */
+
+/*
+ * Shared options
+ */
+#define IFM_FDX 0x00100000 /* Force full duplex */
+#define IFM_HDX 0x00200000 /* Force half duplex */
+#define IFM_FLOW 0x00400000 /* enable hardware flow control */
+#define IFM_EEE 0x00800000 /* Support energy efficient ethernet */
+#define IFM_FLAG0 0x01000000 /* Driver defined flag */
+#define IFM_FLAG1 0x02000000 /* Driver defined flag */
+#define IFM_FLAG2 0x04000000 /* Driver defined flag */
+#define IFM_LOOP 0x08000000 /* Put hardware in loopback */
+
+/*
+ * Macros to access bits of extended media sub-types (media variants)
+ */
+#define IFM_TMASK_COMPAT 0x0000001f /* Lower bits of media sub-type */
+#define IFM_TMASK_EXT 0x000f0000 /* For extended media sub-type */
+#define IFM_TMASK_EXT_SHIFT 11 /* to extract high bits */
+#define IFM_X_SUBTYPE(x) (((x) & IFM_TMASK_COMPAT) | \
+ (((x) & (IFM_TMASK_EXT >> IFM_TMASK_EXT_SHIFT)) << IFM_TMASK_EXT_SHIFT))
+
+/*
+ * Masks
+ */
+#define IFM_NMASK 0x000000e0 /* Network type */
+#define IFM_TMASK (IFM_TMASK_COMPAT|IFM_TMASK_EXT) /* Media sub-type */
+#define IFM_IMASK 0xf0000000 /* Instance */
+#define IFM_ISHIFT 28 /* Instance shift */
+#define IFM_OMASK 0x0000ff00 /* Type specific options */
+#define IFM_GMASK 0x0ff00000 /* Global options */
+
+/*
+ * Status bits
+ */
+#define IFM_AVALID 0x00000001 /* Active bit valid */
+#define IFM_ACTIVE 0x00000002 /* Interface attached to working net */
+#define IFM_WAKESAMENET 0x00000004 /* No link transition while asleep */
+
+/*
+ * Macros to extract various bits of information from the media word.
+ */
+#define IFM_TYPE(x) ((x) & IFM_NMASK)
+#define IFM_SUBTYPE(x) ((x) & IFM_TMASK)
+#define IFM_TYPE_OPTIONS(x) ((x) & IFM_OMASK)
+#define IFM_INST(x) (((x) & IFM_IMASK) >> IFM_ISHIFT)
+#define IFM_OPTIONS(x) ((x) & (IFM_OMASK|IFM_GMASK))
+
+#define IFM_INST_MAX IFM_INST(IFM_IMASK)
+
+/*
+ * Macro to create a media word.
+ */
+#define IFM_MAKEWORD(type, subtype, options, instance) \
+ ((type) | (subtype) | (options) | ((instance) << IFM_ISHIFT))
+
+/*
+ * NetBSD extension not defined in the BSDI API. This is used in various
+ * places to get the canonical description for a given type/subtype.
+ *
+ * NOTE: all but the top-level type descriptions must contain NO whitespace!
+ * Otherwise, parsing these in ifconfig(8) would be a nightmare.
+ */
+struct ifmedia_description {
+ int ifmt_word; /* word value; may be masked */
+ const char *ifmt_string; /* description */
+};
+
+#define IFM_TYPE_DESCRIPTIONS { \
+ { IFM_ETHER, "Ethernet" }, \
+ { IFM_TOKEN, "Token ring" }, \
+ { IFM_FDDI, "FDDI" }, \
+ { IFM_IEEE80211, "IEEE802.11" }, \
+ { 0, NULL }, \
+}
+
+#define IFM_SUBTYPE_ETHERNET_DESCRIPTIONS { \
+ { IFM_10_T, "10baseT/UTP" }, \
+ { IFM_10_2, "10base2/BNC" }, \
+ { IFM_10_5, "10base5/AUI" }, \
+ { IFM_100_TX, "100baseTX" }, \
+ { IFM_100_FX, "100baseFX" }, \
+ { IFM_100_T4, "100baseT4" }, \
+ { IFM_100_VG, "100baseVG" }, \
+ { IFM_100_T2, "100baseT2" }, \
+ { IFM_10_STP, "10baseSTP" }, \
+ { IFM_10_FL, "10baseFL" }, \
+ { IFM_1000_SX, "1000baseSX" }, \
+ { IFM_1000_LX, "1000baseLX" }, \
+ { IFM_1000_CX, "1000baseCX" }, \
+ { IFM_1000_T, "1000baseT" }, \
+ { IFM_HPNA_1, "homePNA" }, \
+ { IFM_10G_LR, "10Gbase-LR" }, \
+ { IFM_10G_SR, "10Gbase-SR" }, \
+ { IFM_10G_CX4, "10Gbase-CX4" }, \
+ { IFM_2500_SX, "2500BaseSX" }, \
+ { IFM_10G_LRM, "10Gbase-LRM" }, \
+ { IFM_10G_TWINAX, "10Gbase-Twinax" }, \
+ { IFM_10G_TWINAX_LONG, "10Gbase-Twinax-Long" }, \
+ { IFM_10G_T, "10Gbase-T" }, \
+ { IFM_40G_CR4, "40Gbase-CR4" }, \
+ { IFM_40G_SR4, "40Gbase-SR4" }, \
+ { IFM_40G_LR4, "40Gbase-LR4" }, \
+ { IFM_1000_KX, "1000Base-KX" }, \
+ { IFM_OTHER, "Other" }, \
+ { IFM_10G_KX4, "10GBase-KX4" }, \
+ { IFM_10G_KR, "10GBase-KR" }, \
+ { IFM_10G_CR1, "10GBase-CR1" }, \
+ { IFM_20G_KR2, "20GBase-KR2" }, \
+ { IFM_2500_KX, "2500Base-KX" }, \
+ { IFM_2500_T, "2500Base-T" }, \
+ { IFM_5000_T, "5000Base-T" }, \
+ { IFM_50G_PCIE, "PCIExpress-50G" }, \
+ { IFM_25G_PCIE, "PCIExpress-25G" }, \
+ { IFM_1000_SGMII, "1000Base-SGMII" }, \
+ { IFM_10G_SFI, "10GBase-SFI" }, \
+ { IFM_40G_XLPPI, "40GBase-XLPPI" }, \
+ { IFM_1000_CX_SGMII, "1000Base-CX-SGMII" }, \
+ { IFM_40G_KR4, "40GBase-KR4" }, \
+ { IFM_10G_ER, "10GBase-ER" }, \
+ { IFM_100G_CR4, "100GBase-CR4" }, \
+ { IFM_100G_SR4, "100GBase-SR4" }, \
+ { IFM_100G_KR4, "100GBase-KR4" }, \
+ { IFM_100G_LR4, "100GBase-LR4" }, \
+ { IFM_56G_R4, "56GBase-R4" }, \
+ { IFM_100_T, "100BaseT" }, \
+ { IFM_25G_CR, "25GBase-CR" }, \
+ { IFM_25G_KR, "25GBase-KR" }, \
+ { IFM_25G_SR, "25GBase-SR" }, \
+ { IFM_50G_CR2, "50GBase-CR2" }, \
+ { IFM_50G_KR2, "50GBase-KR2" }, \
+ { IFM_25G_LR, "25GBase-LR" }, \
+ { IFM_10G_AOC, "10GBase-AOC" }, \
+ { IFM_25G_ACC, "25GBase-ACC" }, \
+ { IFM_25G_AOC, "25GBase-AOC" }, \
+ { IFM_100_SGMII, "100M-SGMII" }, \
+ { IFM_2500_X, "2500Base-X" }, \
+ { IFM_5000_KR, "5000Base-KR" }, \
+ { IFM_25G_T, "25GBase-T" }, \
+ { IFM_25G_CR_S, "25GBase-CR-S" }, \
+ { IFM_25G_CR1, "25GBase-CR1" }, \
+ { IFM_25G_KR_S, "25GBase-KR-S" }, \
+ { IFM_5000_KR_S, "5000Base-KR-S" }, \
+ { IFM_5000_KR1, "5000Base-KR1" }, \
+ { IFM_25G_AUI, "25G-AUI" }, \
+ { IFM_40G_XLAUI, "40G-XLAUI" }, \
+ { IFM_40G_XLAUI_AC, "40G-XLAUI-AC" }, \
+ { IFM_40G_ER4, "40GBase-ER4" }, \
+ { IFM_50G_SR2, "50GBase-SR2" }, \
+ { IFM_50G_LR2, "50GBase-LR2" }, \
+ { IFM_50G_LAUI2_AC, "50G-LAUI2-AC" }, \
+ { IFM_50G_LAUI2, "50G-LAUI2" }, \
+ { IFM_50G_AUI2_AC, "50G-AUI2-AC" }, \
+ { IFM_50G_AUI2, "50G-AUI2" }, \
+ { IFM_50G_CP, "50GBase-CP" }, \
+ { IFM_50G_SR, "50GBase-SR" }, \
+ { IFM_50G_LR, "50GBase-LR" }, \
+ { IFM_50G_FR, "50GBase-FR" }, \
+ { IFM_50G_KR_PAM4, "50GBase-KR-PAM4" }, \
+ { IFM_25G_KR1, "25GBase-KR1" }, \
+ { IFM_50G_AUI1_AC, "50G-AUI1-AC" }, \
+ { IFM_50G_AUI1, "50G-AUI1" }, \
+ { IFM_100G_CAUI4_AC, "100G-CAUI4-AC" }, \
+ { IFM_100G_CAUI4, "100G-CAUI4" }, \
+ { IFM_100G_AUI4_AC, "100G-AUI4-AC" }, \
+ { IFM_100G_AUI4, "100G-AUI4" }, \
+ { IFM_100G_CR_PAM4, "100GBase-CR-PAM4" }, \
+ { IFM_100G_KR_PAM4, "100GBase-KR-PAM4" }, \
+ { IFM_100G_CP2, "100GBase-CP2" }, \
+ { IFM_100G_SR2, "100GBase-SR2" }, \
+ { IFM_100G_DR, "100GBase-DR" }, \
+ { IFM_100G_KR2_PAM4, "100GBase-KR2-PAM4" }, \
+ { IFM_100G_CAUI2_AC, "100G-CAUI2-AC" }, \
+ { IFM_100G_CAUI2, "100G-CAUI2" }, \
+ { IFM_100G_AUI2_AC, "100G-AUI2-AC" }, \
+ { IFM_100G_AUI2, "100G-AUI2" }, \
+ { IFM_200G_CR4_PAM4, "200GBase-CR4-PAM4" }, \
+ { IFM_200G_SR4, "200GBase-SR4" }, \
+ { IFM_200G_FR4, "200GBase-FR4" }, \
+ { IFM_200G_LR4, "200GBase-LR4" }, \
+ { IFM_200G_DR4, "200GBase-DR4" }, \
+ { IFM_200G_KR4_PAM4, "200GBase-KR4-PAM4" }, \
+ { IFM_200G_AUI4_AC, "200G-AUI4-AC" }, \
+ { IFM_200G_AUI4, "200G-AUI4" }, \
+ { IFM_200G_AUI8_AC, "200G-AUI8-AC" }, \
+ { IFM_200G_AUI8, "200G-AUI8" }, \
+ { IFM_400G_FR8, "400GBase-FR8" }, \
+ { IFM_400G_LR8, "400GBase-LR8" }, \
+ { IFM_400G_DR4, "400GBase-DR4" }, \
+ { IFM_400G_AUI8_AC, "400G-AUI8-AC" }, \
+ { IFM_400G_AUI8, "400G-AUI8" }, \
+ { 0, NULL }, \
+}
+
+#define IFM_SUBTYPE_ETHERNET_ALIASES { \
+ { IFM_10_T, "UTP" }, \
+ { IFM_10_T, "10UTP" }, \
+ { IFM_10_2, "BNC" }, \
+ { IFM_10_2, "10BNC" }, \
+ { IFM_10_5, "AUI" }, \
+ { IFM_10_5, "10AUI" }, \
+ { IFM_100_TX, "100TX" }, \
+ { IFM_100_FX, "100FX" }, \
+ { IFM_100_T4, "100T4" }, \
+ { IFM_100_VG, "100VG" }, \
+ { IFM_100_T2, "100T2" }, \
+ { IFM_1000_SX, "1000SX" }, \
+ { IFM_10_STP, "STP" }, \
+ { IFM_10_STP, "10STP" }, \
+ { IFM_10_FL, "FL" }, \
+ { IFM_10_FL, "10FL" }, \
+ { IFM_1000_LX, "1000LX" }, \
+ { IFM_1000_CX, "1000CX" }, \
+ { IFM_1000_T, "1000T" }, \
+ { IFM_HPNA_1, "HPNA1" }, \
+ { IFM_10G_SR, "10GSR" }, \
+ { IFM_10G_LR, "10GLR" }, \
+ { IFM_10G_CX4, "10GCX4" }, \
+ { IFM_10G_T, "10GT" }, \
+ { 0, NULL }, \
+}
+
+#define IFM_SUBTYPE_ETHERNET_OPTION_DESCRIPTIONS { \
+ { 0, NULL }, \
+}
+
+#define IFM_SUBTYPE_TOKENRING_DESCRIPTIONS { \
+ { IFM_TOK_STP4, "DB9/4Mbit" }, \
+ { IFM_TOK_STP16, "DB9/16Mbit" }, \
+ { IFM_TOK_UTP4, "UTP/4Mbit" }, \
+ { IFM_TOK_UTP16, "UTP/16Mbit" }, \
+ { 0, NULL }, \
+}
+
+#define IFM_SUBTYPE_TOKENRING_ALIASES { \
+ { IFM_TOK_STP4, "4STP" }, \
+ { IFM_TOK_STP16, "16STP" }, \
+ { IFM_TOK_UTP4, "4UTP" }, \
+ { IFM_TOK_UTP16, "16UTP" }, \
+ { 0, NULL }, \
+}
+
+#define IFM_SUBTYPE_TOKENRING_OPTION_DESCRIPTIONS { \
+ { IFM_TOK_ETR, "EarlyTokenRelease" }, \
+ { IFM_TOK_SRCRT, "SourceRouting" }, \
+ { IFM_TOK_ALLR, "AllRoutes" }, \
+ { 0, NULL }, \
+}
+
+#define IFM_SUBTYPE_FDDI_DESCRIPTIONS { \
+ { IFM_FDDI_SMF, "Single-mode" }, \
+ { IFM_FDDI_MMF, "Multi-mode" }, \
+ { IFM_FDDI_UTP, "UTP" }, \
+ { 0, NULL }, \
+}
+
+#define IFM_SUBTYPE_FDDI_ALIASES { \
+ { IFM_FDDI_SMF, "SMF" }, \
+ { IFM_FDDI_MMF, "MMF" }, \
+ { IFM_FDDI_UTP, "CDDI" }, \
+ { 0, NULL }, \
+}
+
+#define IFM_SUBTYPE_FDDI_OPTION_DESCRIPTIONS { \
+ { IFM_FDDI_DA, "Dual-attach" }, \
+ { 0, NULL }, \
+}
+
+#define IFM_SUBTYPE_IEEE80211_DESCRIPTIONS { \
+ { IFM_IEEE80211_FH1, "FH1" }, \
+ { IFM_IEEE80211_FH2, "FH2" }, \
+ { IFM_IEEE80211_DS1, "DS1" }, \
+ { IFM_IEEE80211_DS2, "DS2" }, \
+ { IFM_IEEE80211_DS5, "DS5" }, \
+ { IFM_IEEE80211_DS11, "DS11" }, \
+ { IFM_IEEE80211_DS22, "DS22" }, \
+ { 0, NULL }, \
+}
+
+#define IFM_SUBTYPE_IEEE80211_OPTION_DESCRIPTIONS { \
+ { IFM_IEEE80211_ADHOC, "adhoc" }, \
+ { 0, NULL }, \
+}
+
+#define IFM_SUBTYPE_SHARED_DESCRIPTIONS { \
+ { IFM_AUTO, "autoselect" }, \
+ { IFM_MANUAL, "manual" }, \
+ { IFM_NONE, "none" }, \
+ { 0, NULL }, \
+}
+
+#define IFM_SUBTYPE_SHARED_ALIASES { \
+ { IFM_AUTO, "auto" }, \
+ { 0, NULL }, \
+}
+
+#define IFM_SHARED_OPTION_DESCRIPTIONS { \
+ { IFM_FDX, "full-duplex" }, \
+ { IFM_HDX, "half-duplex" }, \
+ { IFM_FLOW, "flow-control" }, \
+ { IFM_EEE, "energy-efficient-ethernet" }, \
+ { IFM_FLAG0, "flag0" }, \
+ { IFM_FLAG1, "flag1" }, \
+ { IFM_FLAG2, "flag2" }, \
+ { IFM_LOOP, "hw-loopback" }, \
+ { 0, NULL }, \
+}
+
+#endif /* _NET_IF_MEDIA_H_ */
\ No newline at end of file
diff --git a/src/libraries/Native/Unix/System.Native/ios/netinet/icmp_var.h b/src/libraries/Native/Unix/System.Native/ios/netinet/icmp_var.h
new file mode 100644
index 00000000000000..2633ab1bcf5a3e
--- /dev/null
+++ b/src/libraries/Native/Unix/System.Native/ios/netinet/icmp_var.h
@@ -0,0 +1,121 @@
+/*
+ * Copyright (c) 2000-2013 Apple Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ *
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ *
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ *
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+/*
+ * Copyright (c) 1982, 1986, 1993
+ * The Regents of the University of California. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ * must display the following acknowledgement:
+ * This product includes software developed by the University of
+ * California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * @(#)icmp_var.h 8.1 (Berkeley) 6/10/93
+ * $FreeBSD: src/sys/netinet/icmp_var.h,v 1.15.2.1 2001/02/24 21:35:18 bmilekic Exp $
+ */
+
+#ifndef _NETINET_ICMP_VAR_H_
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wreserved-id-macro"
+#define _NETINET_ICMP_VAR_H_
+#pragma clang diagnostic pop
+#include
+
+/*
+ * Variables related to this implementation
+ * of the internet control message protocol.
+ */
+struct icmpstat {
+/* statistics related to icmp packets generated */
+ u_int32_t icps_error; /* # of calls to icmp_error */
+ u_int32_t icps_oldshort; /* no error 'cuz old ip too short */
+ u_int32_t icps_oldicmp; /* no error 'cuz old was icmp */
+ u_int32_t icps_outhist[ICMP_MAXTYPE + 1];
+/* statistics related to input messages processed */
+ u_int32_t icps_badcode; /* icmp_code out of range */
+ u_int32_t icps_tooshort; /* packet < ICMP_MINLEN */
+ u_int32_t icps_checksum; /* bad checksum */
+ u_int32_t icps_badlen; /* calculated bound mismatch */
+ u_int32_t icps_reflect; /* number of responses */
+ u_int32_t icps_inhist[ICMP_MAXTYPE + 1];
+ u_int32_t icps_bmcastecho;/* b/mcast echo requests dropped */
+ u_int32_t icps_bmcasttstamp; /* b/mcast tstamp requests dropped */
+};
+
+/*
+ * Names for ICMP sysctl objects
+ */
+#define ICMPCTL_MASKREPL 1 /* allow replies to netmask requests */
+#define ICMPCTL_STATS 2 /* statistics (read-only) */
+#define ICMPCTL_ICMPLIM 3
+#define ICMPCTL_TIMESTAMP 4 /* allow replies to time stamp requests */
+#define ICMPCTL_MAXID 5
+
+#ifdef BSD_KERNEL_PRIVATE
+#define ICMPCTL_NAMES { \
+ { 0, 0 }, \
+ { "maskrepl", CTLTYPE_INT }, \
+ { "stats", CTLTYPE_STRUCT }, \
+ { "icmplim", CTLTYPE_INT }, \
+ { "icmptimestamp", CTLTYPE_INT }, \
+}
+
+SYSCTL_DECL(_net_inet_icmp);
+#ifdef ICMP_BANDLIM
+extern boolean_t badport_bandlim(int which);
+#endif
+#define BANDLIM_ICMP_UNREACH 0
+#define BANDLIM_ICMP_ECHO 1
+#define BANDLIM_ICMP_TSTAMP 2
+#define BANDLIM_MAX 4
+
+extern struct icmpstat icmpstat;
+#endif /* BSD_KERNEL_PRIVATE */
+#endif /* _NETINET_ICMP_VAR_H_ */
\ No newline at end of file
diff --git a/src/libraries/Native/Unix/System.Native/ios/netinet/ip_var.h b/src/libraries/Native/Unix/System.Native/ios/netinet/ip_var.h
new file mode 100644
index 00000000000000..e5137effeed46f
--- /dev/null
+++ b/src/libraries/Native/Unix/System.Native/ios/netinet/ip_var.h
@@ -0,0 +1,371 @@
+/*
+ * Copyright (c) 2000-2020 Apple Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ *
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ *
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ *
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+/*
+ * Copyright (c) 1982, 1986, 1993
+ * The Regents of the University of California. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ * must display the following acknowledgement:
+ * This product includes software developed by the University of
+ * California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * @(#)ip_var.h 8.2 (Berkeley) 1/9/95
+ */
+/*
+ * NOTICE: This file was modified by SPARTA, Inc. in 2007 to introduce
+ * support for mandatory and extensible security protections. This notice
+ * is included in support of clause 2.2 (b) of the Apple Public License,
+ * Version 2.0.
+ */
+
+#ifndef _NETINET_IP_VAR_H_
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wreserved-id-macro"
+#define _NETINET_IP_VAR_H_
+#pragma clang diagnostic pop
+#include
+
+/*
+ * Overlay for ip header used by other protocols (tcp, udp).
+ */
+struct ipovly {
+ u_char ih_x1[9]; /* (unused) */
+ u_char ih_pr; /* protocol */
+ u_short ih_len; /* protocol length */
+ struct in_addr ih_src; /* source internet address */
+ struct in_addr ih_dst; /* destination internet address */
+};
+
+#ifdef BSD_KERNEL_PRIVATE
+/*
+ * Ip reassembly queue structure. Each fragment
+ * being reassembled is attached to one of these structures.
+ * They are timed out after ipq_ttl drops to 0, and may also
+ * be reclaimed if memory becomes tight.
+ */
+struct ipq {
+ TAILQ_ENTRY(ipq) ipq_list; /* to other reass headers */
+ struct mbuf *ipq_frags; /* to ip headers of fragments */
+ u_char ipq_ttl; /* time for reass q to live */
+ u_char ipq_p; /* protocol of this fragment */
+ u_short ipq_id; /* sequence id for reassembly */
+ struct in_addr ipq_src, ipq_dst;
+ u_int32_t ipq_nfrags; /* # frags in this packet */
+ uint32_t ipq_csum_flags; /* checksum flags */
+ uint32_t ipq_csum; /* partial checksum value */
+};
+
+/*
+ * Structure stored in mbuf in inpcb.ip_options
+ * and passed to ip_output when ip options are in use.
+ * The actual length of the options (including ipopt_dst)
+ * is in m_len.
+ */
+#endif /* BSD_KERNEL_PRIVATE */
+#define MAX_IPOPTLEN 40
+#ifdef BSD_KERNEL_PRIVATE
+struct ipoption {
+ struct in_addr ipopt_dst; /* first-hop dst if source routed */
+ char ipopt_list[MAX_IPOPTLEN]; /* options proper */
+};
+
+/*
+ * Structure attached to inpcb.ip_moptions and
+ * passed to ip_output when IP multicast options are in use.
+ */
+struct ip_moptions {
+ decl_lck_mtx_data(, imo_lock);
+ uint32_t imo_refcnt; /* ref count */
+ uint32_t imo_debug; /* see ifa_debug flags */
+ struct ifnet *imo_multicast_ifp; /* ifp for outgoing multicasts */
+ u_char imo_multicast_ttl; /* TTL for outgoing multicasts */
+ u_char imo_multicast_loop; /* 1 => hear sends if a member */
+ u_short imo_num_memberships; /* no. memberships this socket */
+ u_short imo_max_memberships; /* max memberships this socket */
+ struct in_multi **imo_membership; /* group memberships */
+ struct in_mfilter *imo_mfilters; /* source filters */
+ u_int32_t imo_multicast_vif; /* vif num outgoing multicasts */
+ struct in_addr imo_multicast_addr; /* ifindex/addr on MULTICAST_IF */
+ void (*imo_trace) /* callback fn for tracing refs */
+ (struct ip_moptions *, int);
+};
+
+#define IMO_LOCK_ASSERT_HELD(_imo) \
+ LCK_MTX_ASSERT(&(_imo)->imo_lock, LCK_MTX_ASSERT_OWNED)
+
+#define IMO_LOCK_ASSERT_NOTHELD(_imo) \
+ LCK_MTX_ASSERT(&(_imo)->imo_lock, LCK_MTX_ASSERT_NOTOWNED)
+
+#define IMO_LOCK(_imo) \
+ lck_mtx_lock(&(_imo)->imo_lock)
+
+#define IMO_LOCK_SPIN(_imo) \
+ lck_mtx_lock_spin(&(_imo)->imo_lock)
+
+#define IMO_CONVERT_LOCK(_imo) do { \
+ IMO_LOCK_ASSERT_HELD(_imo); \
+ lck_mtx_convert_spin(&(_imo)->imo_lock); \
+} while (0)
+
+#define IMO_UNLOCK(_imo) \
+ lck_mtx_unlock(&(_imo)->imo_lock)
+
+#define IMO_ADDREF(_imo) \
+ imo_addref(_imo, 0)
+
+#define IMO_ADDREF_LOCKED(_imo) \
+ imo_addref(_imo, 1)
+
+#define IMO_REMREF(_imo) \
+ imo_remref(_imo)
+
+/* mbuf tag for ip_forwarding info */
+struct ip_fwd_tag {
+ struct sockaddr_in *next_hop; /* next_hop */
+};
+#endif /* BSD_KERNEL_PRIVATE */
+
+struct ipstat {
+ u_int32_t ips_total; /* total packets received */
+ u_int32_t ips_badsum; /* checksum bad */
+ u_int32_t ips_tooshort; /* packet too short */
+ u_int32_t ips_toosmall; /* not enough data */
+ u_int32_t ips_badhlen; /* ip header length < data size */
+ u_int32_t ips_badlen; /* ip length < ip header length */
+ u_int32_t ips_fragments; /* fragments received */
+ u_int32_t ips_fragdropped; /* frags dropped (dups, out of space) */
+ u_int32_t ips_fragtimeout; /* fragments timed out */
+ u_int32_t ips_forward; /* packets forwarded */
+ u_int32_t ips_fastforward; /* packets fast forwarded */
+ u_int32_t ips_cantforward; /* packets rcvd for unreachable dest */
+ u_int32_t ips_redirectsent; /* packets forwarded on same net */
+ u_int32_t ips_noproto; /* unknown or unsupported protocol */
+ u_int32_t ips_delivered; /* datagrams delivered to upper level */
+ u_int32_t ips_localout; /* total ip packets generated here */
+ u_int32_t ips_odropped; /* lost packets due to nobufs, etc. */
+ u_int32_t ips_reassembled; /* total packets reassembled ok */
+ u_int32_t ips_fragmented; /* datagrams successfully fragmented */
+ u_int32_t ips_ofragments; /* output fragments created */
+ u_int32_t ips_cantfrag; /* don't fragment flag was set, etc. */
+ u_int32_t ips_badoptions; /* error in option processing */
+ u_int32_t ips_noroute; /* packets discarded due to no route */
+ u_int32_t ips_badvers; /* ip version != 4 */
+ u_int32_t ips_rawout; /* total raw ip packets generated */
+ u_int32_t ips_toolong; /* ip length > max ip packet size */
+ u_int32_t ips_notmember; /* multicasts for unregistered grps */
+ u_int32_t ips_nogif; /* no match gif found */
+ u_int32_t ips_badaddr; /* invalid address on header */
+ u_int32_t ips_pktdropcntrl; /* pkt dropped, no mbufs for ctl data */
+ u_int32_t ips_rcv_swcsum; /* ip hdr swcksum (inbound), packets */
+ u_int32_t ips_rcv_swcsum_bytes; /* ip hdr swcksum (inbound), bytes */
+ u_int32_t ips_snd_swcsum; /* ip hdr swcksum (outbound), packets */
+ u_int32_t ips_snd_swcsum_bytes; /* ip hdr swcksum (outbound), bytes */
+ u_int32_t ips_adj; /* total packets trimmed/adjusted */
+ u_int32_t ips_adj_hwcsum_clr; /* hwcksum discarded during adj */
+ u_int32_t ips_rxc_collisions; /* rx chaining collisions */
+ u_int32_t ips_rxc_chained; /* rx chains */
+ u_int32_t ips_rxc_notchain; /* rx bypassed chaining */
+ u_int32_t ips_rxc_chainsz_gt2; /* rx chain size greater than 2 */
+ u_int32_t ips_rxc_chainsz_gt4; /* rx chain size greater than 4 */
+ u_int32_t ips_rxc_notlist; /* count of pkts through ip_input */
+ u_int32_t ips_raw_sappend_fail; /* sock append failed */
+ u_int32_t ips_necp_policy_drop; /* NECP policy related drop */
+ u_int32_t ips_rcv_if_weak_match; /* packets whose receive interface that passed the Weak ES address check */
+ u_int32_t ips_rcv_if_no_match; /* packets whose receive interface did not pass the address check */
+};
+
+struct ip_linklocal_stat {
+ u_int32_t iplls_in_total;
+ u_int32_t iplls_in_badttl;
+ u_int32_t iplls_out_total;
+ u_int32_t iplls_out_badttl;
+};
+
+#ifdef KERNEL_PRIVATE
+/* forward declarations for ip_output() */
+struct ip_out_args;
+struct ip_moptions;
+#endif /* KERNEL_PRIVATE */
+
+#ifdef BSD_KERNEL_PRIVATE
+/* flags passed to ip_output as last parameter */
+#define IP_FORWARDING 0x1 /* most of ip header exists */
+#define IP_RAWOUTPUT 0x2 /* raw ip header exists */
+#define IP_NOIPSEC 0x4 /* No IPsec processing */
+#define IP_ROUTETOIF SO_DONTROUTE /* bypass routing tables (0x0010) */
+#define IP_ALLOWBROADCAST SO_BROADCAST /* can send broadcast pkts (0x0020) */
+#define IP_OUTARGS 0x100 /* has ancillary output info */
+
+#define IP_HDR_ALIGNED_P(_ip) ((((uintptr_t)(_ip)) & ((uintptr_t)3)) == 0)
+#define IP_OFF_IS_ATOMIC(_ip_off) ((_ip_off & (IP_DF | IP_MF | IP_OFFMASK)) == IP_DF)
+
+/*
+ * On platforms which require strict alignment (currently for anything but
+ * i386 or x86_64), this macro checks whether the pointer to the IP header
+ * is 32-bit aligned, and assert otherwise.
+ */
+#if defined(__i386__) || defined(__x86_64__)
+#define IP_HDR_STRICT_ALIGNMENT_CHECK(_ip) do { } while (0)
+#else /* !__i386__ && !__x86_64__ */
+#define IP_HDR_STRICT_ALIGNMENT_CHECK(_ip) do { \
+ if (!IP_HDR_ALIGNED_P(_ip)) { \
+ panic_plain("\n%s: Unaligned IP header %p\n", \
+ __func__, _ip); \
+ } \
+} while (0)
+#endif /* !__i386__ && !__x86_64__ */
+
+struct ip;
+struct inpcb;
+struct route;
+struct sockopt;
+
+#include
+#include
+
+/*
+ * Extra information passed to ip_output when IP_OUTARGS is set.
+ *
+ * Upon returning an error to the caller, ip_output may indicate through
+ * ipoa_retflags any additional information regarding the error.
+ */
+struct ip_out_args {
+ unsigned int ipoa_boundif; /* boundif interface index */
+ struct flowadv ipoa_flowadv; /* flow advisory code */
+ u_int32_t ipoa_flags; /* IPOAF output flags (see below) */
+#define IPOAF_SELECT_SRCIF 0x00000001 /* src interface selection */
+#define IPOAF_BOUND_IF 0x00000002 /* boundif value is valid */
+#define IPOAF_BOUND_SRCADDR 0x00000004 /* bound to src address */
+#define IPOAF_NO_CELLULAR 0x00000010 /* skip IFT_CELLULAR */
+#define IPOAF_NO_EXPENSIVE 0x00000020 /* skip IFT_EXPENSIVE */
+#define IPOAF_AWDL_UNRESTRICTED 0x00000040 /* can send over
+ * AWDL_RESTRICTED */
+#define IPOAF_QOSMARKING_ALLOWED 0x00000080 /* policy allows Fastlane DSCP marking */
+#define IPOAF_NO_CONSTRAINED 0x00000100 /* skip IFXF_CONSTRAINED */
+#define IPOAF_REDO_QOSMARKING_POLICY 0x00000200 /* Re-evaluate QOS marking policy */
+ u_int32_t ipoa_retflags; /* IPOARF return flags (see below) */
+#define IPOARF_IFDENIED 0x00000001 /* denied access to interface */
+ int ipoa_sotc; /* traffic class for Fastlane DSCP mapping */
+ int ipoa_netsvctype; /* network service type */
+ int32_t qos_marking_gencount;
+};
+
+extern struct ipstat ipstat;
+extern int ip_use_randomid;
+extern u_short ip_id; /* ip packet ctr, for ids */
+extern int ip_defttl; /* default IP ttl */
+extern int ipforwarding; /* ip forwarding */
+extern int rfc6864;
+extern struct protosw *ip_protox[];
+extern struct pr_usrreqs rip_usrreqs;
+
+extern void ip_moptions_init(void);
+extern struct ip_moptions *ip_allocmoptions(zalloc_flags_t);
+extern int inp_getmoptions(struct inpcb *, struct sockopt *);
+extern int inp_setmoptions(struct inpcb *, struct sockopt *);
+extern void imo_addref(struct ip_moptions *, int);
+extern void imo_remref(struct ip_moptions *);
+
+struct protosw;
+struct domain;
+
+extern int ip_checkrouteralert(struct mbuf *);
+extern int ip_ctloutput(struct socket *, struct sockopt *sopt);
+extern void ip_drain(void);
+extern void ip_init(struct protosw *, struct domain *);
+extern int ip_output(struct mbuf *, struct mbuf *, struct route *, int,
+ struct ip_moptions *, struct ip_out_args *);
+extern int ip_output_list(struct mbuf *, int, struct mbuf *, struct route *,
+ int, struct ip_moptions *, struct ip_out_args *);
+extern void ip_output_checksum(struct ifnet *, struct mbuf *, int, int,
+ uint32_t *);
+extern struct in_ifaddr *ip_rtaddr(struct in_addr);
+extern int ip_savecontrol(struct inpcb *, struct mbuf **, struct ip *,
+ struct mbuf *);
+extern struct mbuf *ip_srcroute(void);
+extern void ip_stripoptions(struct mbuf *);
+extern void ip_initid(void);
+extern u_int16_t ip_randomid(void);
+extern int ip_fragment(struct mbuf *, struct ifnet *, uint32_t, int);
+
+extern void ip_setsrcifaddr_info(struct mbuf *, uint32_t, struct in_ifaddr *);
+extern void ip_setdstifaddr_info(struct mbuf *, uint32_t, struct in_ifaddr *);
+extern int ip_getsrcifaddr_info(struct mbuf *, uint32_t *, uint32_t *);
+extern int ip_getdstifaddr_info(struct mbuf *, uint32_t *, uint32_t *);
+
+extern int rip_ctloutput(struct socket *, struct sockopt *);
+extern void rip_ctlinput(int, struct sockaddr *, void *, struct ifnet *);
+extern void rip_init(struct protosw *, struct domain *);
+extern void rip_input(struct mbuf *, int);
+extern int rip_output(struct mbuf *, struct socket *, u_int32_t, struct mbuf *);
+extern int rip_unlock(struct socket *, int, void *);
+extern int rip_send(struct socket *, int, struct mbuf *, struct sockaddr *,
+ struct mbuf *, struct proc *);
+
+extern void tcp_in_cksum_stats(u_int32_t);
+extern void tcp_out_cksum_stats(u_int32_t);
+
+extern void udp_in_cksum_stats(u_int32_t);
+extern void udp_out_cksum_stats(u_int32_t);
+
+extern void tcp_in6_cksum_stats(u_int32_t);
+extern void tcp_out6_cksum_stats(u_int32_t);
+
+extern void udp_in6_cksum_stats(u_int32_t);
+extern void udp_out6_cksum_stats(u_int32_t);
+#endif /* BSD_KERNEL_PRIVATE */
+#ifdef KERNEL_PRIVATE
+/* for PPP/PPTP */
+extern int ip_gre_output(struct mbuf *);
+typedef struct mbuf *(*gre_input_func_t)(struct mbuf *, int, int);
+extern int ip_gre_register_input(gre_input_func_t);
+#endif /* KERNEL_PRIVATE */
+#endif /* !_NETINET_IP_VAR_H_ */
\ No newline at end of file
diff --git a/src/libraries/Native/Unix/System.Native/ios/netinet/tcp_fsm.h b/src/libraries/Native/Unix/System.Native/ios/netinet/tcp_fsm.h
new file mode 100644
index 00000000000000..869d9bcef8d511
--- /dev/null
+++ b/src/libraries/Native/Unix/System.Native/ios/netinet/tcp_fsm.h
@@ -0,0 +1,153 @@
+/*
+ * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ *
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ *
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ *
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+/*
+ * Copyright (c) 1982, 1986, 1993
+ * The Regents of the University of California. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ * must display the following acknowledgement:
+ * This product includes software developed by the University of
+ * California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * @(#)tcp_fsm.h 8.1 (Berkeley) 6/10/93
+ * $FreeBSD: src/sys/netinet/tcp_fsm.h,v 1.14 1999/11/07 04:18:30 jlemon Exp $
+ */
+
+#ifndef _NETINET_TCP_FSM_H_
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wreserved-id-macro"
+#define _NETINET_TCP_FSM_H_
+#pragma clang diagnostic pop
+#include
+
+/*
+ * TCP FSM state definitions.
+ * Per RFC793, September, 1981.
+ */
+
+#define TCP_NSTATES 11
+
+#define TCPS_CLOSED 0 /* closed */
+#define TCPS_LISTEN 1 /* listening for connection */
+#define TCPS_SYN_SENT 2 /* active, have sent syn */
+#define TCPS_SYN_RECEIVED 3 /* have send and received syn */
+/* states < TCPS_ESTABLISHED are those where connections not established */
+#define TCPS_ESTABLISHED 4 /* established */
+#define TCPS_CLOSE_WAIT 5 /* rcvd fin, waiting for close */
+/* states > TCPS_CLOSE_WAIT are those where user has closed */
+#define TCPS_FIN_WAIT_1 6 /* have closed, sent fin */
+#define TCPS_CLOSING 7 /* closed xchd FIN; await FIN ACK */
+#define TCPS_LAST_ACK 8 /* had fin and close; await FIN ACK */
+/* states > TCPS_CLOSE_WAIT && < TCPS_FIN_WAIT_2 await ACK of FIN */
+#define TCPS_FIN_WAIT_2 9 /* have closed, fin is acked */
+#define TCPS_TIME_WAIT 10 /* in 2*msl quiet wait after close */
+
+/* for KAME src sync over BSD*'s */
+#define TCP6_NSTATES TCP_NSTATES
+#define TCP6S_CLOSED TCPS_CLOSED
+#define TCP6S_LISTEN TCPS_LISTEN
+#define TCP6S_SYN_SENT TCPS_SYN_SENT
+#define TCP6S_SYN_RECEIVED TCPS_SYN_RECEIVED
+#define TCP6S_ESTABLISHED TCPS_ESTABLISHED
+#define TCP6S_CLOSE_WAIT TCPS_CLOSE_WAIT
+#define TCP6S_FIN_WAIT_1 TCPS_FIN_WAIT_1
+#define TCP6S_CLOSING TCPS_CLOSING
+#define TCP6S_LAST_ACK TCPS_LAST_ACK
+#define TCP6S_FIN_WAIT_2 TCPS_FIN_WAIT_2
+#define TCP6S_TIME_WAIT TCPS_TIME_WAIT
+
+#define TCPS_HAVERCVDSYN(s) ((s) >= TCPS_SYN_RECEIVED)
+#define TCPS_HAVEESTABLISHED(s) ((s) >= TCPS_ESTABLISHED)
+#define TCPS_HAVERCVDFIN(s) ((s) >= TCPS_TIME_WAIT)
+#define TCPS_HAVERCVDFIN2(s) ((s) == TCPS_CLOSE_WAIT || \
+ (s) == TCPS_CLOSING || \
+ (s) == TCPS_LAST_ACK || \
+ (s) == TCPS_TIME_WAIT)
+
+#ifdef KERNEL_PRIVATE
+#ifdef TCPOUTFLAGS
+/*
+ * Flags used when sending segments in tcp_output.
+ * Basic flags (TH_RST,TH_ACK,TH_SYN,TH_FIN) are totally
+ * determined by state, with the proviso that TH_FIN is sent only
+ * if all data queued for output is included in the segment.
+ */
+static u_char tcp_outflags[TCP_NSTATES] = {
+ TH_RST | TH_ACK, /* 0, CLOSED */
+ 0, /* 1, LISTEN */
+ TH_SYN, /* 2, SYN_SENT */
+ TH_SYN | TH_ACK, /* 3, SYN_RECEIVED */
+ TH_ACK, /* 4, ESTABLISHED */
+ TH_ACK, /* 5, CLOSE_WAIT */
+ TH_FIN | TH_ACK, /* 6, FIN_WAIT_1 */
+ TH_FIN | TH_ACK, /* 7, CLOSING */
+ TH_FIN | TH_ACK, /* 8, LAST_ACK */
+ TH_ACK, /* 9, FIN_WAIT_2 */
+ TH_ACK, /* 10, TIME_WAIT */
+};
+#endif
+#endif /* KERNEL_PRIVATE */
+
+#if KPROF
+#ifdef KERNEL_PRIVATE
+int tcp_acounts[TCP_NSTATES][PRU_NREQ];
+#endif /* KERNEL_PRIVATE */
+#endif
+
+#ifdef TCPSTATES
+char *tcpstates[] = {
+ "CLOSED", "LISTEN", "SYN_SENT", "SYN_RCVD",
+ "ESTABLISHED", "CLOSE_WAIT", "FIN_WAIT_1", "CLOSING",
+ "LAST_ACK", "FIN_WAIT_2", "TIME_WAIT"
+};
+#endif
+
+#endif
\ No newline at end of file
diff --git a/src/libraries/Native/Unix/System.Native/ios/netinet/udp_var.h b/src/libraries/Native/Unix/System.Native/ios/netinet/udp_var.h
new file mode 100644
index 00000000000000..12e4ea51f0b49e
--- /dev/null
+++ b/src/libraries/Native/Unix/System.Native/ios/netinet/udp_var.h
@@ -0,0 +1,188 @@
+/*
+ * Copyright (c) 2008-2016 Apple Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ *
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ *
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ *
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+/*
+ * Copyright (c) 1982, 1986, 1989, 1993
+ * The Regents of the University of California. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ * must display the following acknowledgement:
+ * This product includes software developed by the University of
+ * California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * @(#)udp_var.h 8.1 (Berkeley) 6/10/93
+ */
+
+#ifndef _NETINET_UDP_VAR_H_
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wreserved-id-macro"
+#define _NETINET_UDP_VAR_H_
+#pragma clang diagnostic pop
+
+#include
+#include
+
+/*
+ * UDP kernel structures and variables.
+ */
+struct udpiphdr {
+ struct ipovly ui_i; /* overlaid ip structure */
+ struct udphdr ui_u; /* udp header */
+};
+#define ui_x1 ui_i.ih_x1
+#define ui_pr ui_i.ih_pr
+#define ui_len ui_i.ih_len
+#define ui_src ui_i.ih_src
+#define ui_dst ui_i.ih_dst
+#define ui_sport ui_u.uh_sport
+#define ui_dport ui_u.uh_dport
+#define ui_ulen ui_u.uh_ulen
+#define ui_sum ui_u.uh_sum
+#define ui_next ui_i.ih_next
+#define ui_prev ui_i.ih_prev
+
+struct udpstat {
+ /* input statistics: */
+ u_int32_t udps_ipackets; /* total input packets */
+ u_int32_t udps_hdrops; /* packet shorter than header */
+ u_int32_t udps_badsum; /* checksum error */
+ u_int32_t udps_badlen; /* data length larger than packet */
+ u_int32_t udps_noport; /* no socket on port */
+ u_int32_t udps_noportbcast; /* of above, arrived as broadcast */
+ u_int32_t udps_fullsock; /* not delivered, input socket full */
+ u_int32_t udpps_pcbcachemiss; /* input packets missing pcb cache */
+ u_int32_t udpps_pcbhashmiss; /* input packets not for hashed pcb */
+ /* output statistics: */
+ u_int32_t udps_opackets; /* total output packets */
+ u_int32_t udps_fastout; /* output packets on fast path */
+ u_int32_t udps_nosum; /* no checksum */
+ u_int32_t udps_noportmcast; /* of no socket on port, multicast */
+ u_int32_t udps_filtermcast; /* blocked by multicast filter */
+ /* checksum statistics: */
+ u_int32_t udps_rcv_swcsum; /* udp swcksum (inbound), packets */
+ u_int32_t udps_rcv_swcsum_bytes; /* udp swcksum (inbound), bytes */
+ u_int32_t udps_rcv6_swcsum; /* udp6 swcksum (inbound), packets */
+ u_int32_t udps_rcv6_swcsum_bytes; /* udp6 swcksum (inbound), bytes */
+ u_int32_t udps_snd_swcsum; /* udp swcksum (outbound), packets */
+ u_int32_t udps_snd_swcsum_bytes; /* udp swcksum (outbound), bytes */
+ u_int32_t udps_snd6_swcsum; /* udp6 swcksum (outbound), packets */
+ u_int32_t udps_snd6_swcsum_bytes; /* udp6 swcksum (outbound), bytes */
+};
+
+/*
+ * Names for UDP sysctl objects
+ */
+#define UDPCTL_CHECKSUM 1 /* checksum UDP packets */
+#define UDPCTL_STATS 2 /* statistics (read-only) */
+#define UDPCTL_MAXDGRAM 3 /* max datagram size */
+#define UDPCTL_RECVSPACE 4 /* default receive buffer space */
+#define UDPCTL_PCBLIST 5 /* list of PCBs for UDP sockets */
+#define UDPCTL_MAXID 6
+
+#ifdef BSD_KERNEL_PRIVATE
+#include
+#include
+
+#define UDPCTL_NAMES { \
+ { 0, 0 }, \
+ { "checksum", CTLTYPE_INT }, \
+ { "stats", CTLTYPE_STRUCT }, \
+ { "maxdgram", CTLTYPE_INT }, \
+ { "recvspace", CTLTYPE_INT }, \
+ { "pcblist", CTLTYPE_STRUCT }, \
+}
+
+#define udp6stat udpstat
+#define udp6s_opackets udps_opackets
+
+SYSCTL_DECL(_net_inet_udp);
+
+struct udpstat_local {
+ u_int64_t port_unreach;
+ u_int64_t faithprefix; /* deprecated */
+ u_int64_t port0;
+ u_int64_t badlength;
+ u_int64_t badchksum;
+ u_int64_t badmcast;
+ u_int64_t cleanup;
+ u_int64_t badipsec;
+};
+
+extern struct pr_usrreqs udp_usrreqs;
+extern struct inpcbhead udb;
+extern struct inpcbinfo udbinfo;
+extern u_int32_t udp_sendspace;
+extern u_int32_t udp_recvspace;
+extern struct udpstat udpstat;
+extern int udp_log_in_vain;
+
+__BEGIN_DECLS
+extern void udp_ctlinput(int, struct sockaddr *, void *, struct ifnet *);
+extern int udp_ctloutput(struct socket *, struct sockopt *);
+extern void udp_init(struct protosw *, struct domain *);
+extern void udp_input(struct mbuf *, int);
+extern int udp_connectx_common(struct socket *, int, struct sockaddr *,
+ struct sockaddr *, struct proc *, uint32_t, sae_associd_t,
+ sae_connid_t *, uint32_t, void *, uint32_t, struct uio*, user_ssize_t *);
+extern void udp_notify(struct inpcb *inp, int errno);
+extern int udp_shutdown(struct socket *so);
+extern int udp_lock(struct socket *, int, void *);
+extern int udp_unlock(struct socket *, int, void *);
+extern lck_mtx_t *udp_getlock(struct socket *, int);
+extern void udp_get_ports_used(u_int32_t, int, u_int32_t, bitstr_t *);
+extern uint32_t udp_count_opportunistic(unsigned int, u_int32_t);
+extern uint32_t udp_find_anypcb_byaddr(struct ifaddr *);
+
+extern void udp_fill_keepalive_offload_frames(struct ifnet *,
+ struct ifnet_keepalive_offload_frame *, u_int32_t, size_t, u_int32_t *);
+
+__END_DECLS
+#endif /* BSD_KERNEL_PRIVATE */
+#endif /* _NETINET_UDP_VAR_H_ */
\ No newline at end of file
diff --git a/src/libraries/Native/Unix/System.Native/pal_environment.c b/src/libraries/Native/Unix/System.Native/pal_environment.c
new file mode 100644
index 00000000000000..fd9e68f0230281
--- /dev/null
+++ b/src/libraries/Native/Unix/System.Native/pal_environment.c
@@ -0,0 +1,32 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+#include "pal_config.h"
+#include "pal_environment.h"
+
+#include
+#include
+#if HAVE_NSGETENVIRON
+#include
+#endif
+
+char* SystemNative_GetEnv(const char* variable)
+{
+ return getenv(variable);
+}
+
+char** SystemNative_GetEnviron()
+{
+#if HAVE_NSGETENVIRON
+ return *(_NSGetEnviron());
+#else
+ extern char **environ;
+ return environ;
+#endif
+}
+
+void SystemNative_FreeEnviron(char** environ)
+{
+ // no op
+ (void)environ;
+}
diff --git a/src/libraries/Native/Unix/System.Native/pal_environment.h b/src/libraries/Native/Unix/System.Native/pal_environment.h
new file mode 100644
index 00000000000000..dee7a10f3aecdc
--- /dev/null
+++ b/src/libraries/Native/Unix/System.Native/pal_environment.h
@@ -0,0 +1,13 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+#pragma once
+
+#include "pal_compiler.h"
+#include "pal_types.h"
+
+PALEXPORT char* SystemNative_GetEnv(const char* variable);
+
+PALEXPORT char** SystemNative_GetEnviron(void);
+
+PALEXPORT void SystemNative_FreeEnviron(char** environ);
diff --git a/src/libraries/Native/Unix/System.Native/pal_environment.m b/src/libraries/Native/Unix/System.Native/pal_environment.m
new file mode 100644
index 00000000000000..ea4edc6ccd3196
--- /dev/null
+++ b/src/libraries/Native/Unix/System.Native/pal_environment.m
@@ -0,0 +1,78 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+#include "pal_config.h"
+#include "pal_environment.h"
+
+#include
+#include
+#include
+#include
+
+char* SystemNative_GetEnv(const char* variable)
+{
+ return getenv(variable);
+}
+
+static char *empty_key_value_pair = "=";
+
+static void get_environ_helper(const void *key, const void *value, void *context)
+{
+ char ***temp_environ_ptr = (char***)context;
+ const char *utf8_key = [(NSString *)key UTF8String];
+ const char *utf8_value = [(NSString *)value UTF8String];
+ int utf8_key_length = strlen(utf8_key);
+ int utf8_value_length = strlen(utf8_value);
+ char *key_value_pair;
+
+ key_value_pair = malloc(utf8_key_length + utf8_value_length + 2);
+ if (key_value_pair != NULL)
+ {
+ strcpy(key_value_pair, utf8_key);
+ key_value_pair[utf8_key_length] = '=';
+ strcpy(key_value_pair + utf8_key_length + 1, utf8_value);
+ }
+ else
+ {
+ // In case of failed allocation add pointer to preallocated entry. This is
+ // ignored on the managed side and skipped over in SystemNative_FreeEnviron.
+ key_value_pair = empty_key_value_pair;
+ }
+
+ **temp_environ_ptr = key_value_pair;
+ (*temp_environ_ptr)++;
+}
+
+char** SystemNative_GetEnviron()
+{
+ char **temp_environ;
+ char **temp_environ_ptr;
+
+ CFDictionaryRef environment = (CFDictionaryRef)[[NSProcessInfo processInfo] environment];
+ int count = CFDictionaryGetCount(environment);
+ temp_environ = (char **)malloc((count + 1) * sizeof(char *));
+ if (temp_environ != NULL)
+ {
+ temp_environ_ptr = temp_environ;
+ CFDictionaryApplyFunction(environment, get_environ_helper, &temp_environ_ptr);
+ *temp_environ_ptr = NULL;
+ }
+
+ return temp_environ;
+}
+
+void SystemNative_FreeEnviron(char** environ)
+{
+ if (environ != NULL)
+ {
+ for (char** environ_ptr = environ; *environ_ptr != NULL; environ_ptr++)
+ {
+ if (*environ_ptr != empty_key_value_pair)
+ {
+ free(*environ_ptr);
+ }
+ }
+
+ free(environ);
+ }
+}
diff --git a/src/libraries/Native/Unix/System.Native/pal_interfaceaddresses.c b/src/libraries/Native/Unix/System.Native/pal_interfaceaddresses.c
index bc95883b7cb04d..620f2e81495bc6 100644
--- a/src/libraries/Native/Unix/System.Native/pal_interfaceaddresses.c
+++ b/src/libraries/Native/Unix/System.Native/pal_interfaceaddresses.c
@@ -11,7 +11,13 @@
#include
#include
#include
+#if HAVE_IFADDRS || HAVE_GETIFADDRS
#include
+#endif
+#if !HAVE_GETIFADDRS && TARGET_ANDROID
+#include
+#include
+#endif
#include
#include
#include
@@ -29,6 +35,8 @@
#endif
#if HAVE_NET_IFMEDIA_H
#include
+#elif HAVE_IOS_NET_IFMEDIA_H
+#include "ios/net/if_media.h"
#endif
#if defined(AF_PACKET)
@@ -53,7 +61,6 @@
#endif
#endif
-#if HAVE_GETIFADDRS
// Convert mask to prefix length e.g. 255.255.255.0 -> 24
// mask parameter is pointer to buffer where address starts and length is
// buffer length e.g. 4 for IPv4 and 16 for IPv6.
@@ -93,6 +100,50 @@ static inline uint8_t mask2prefix(uint8_t* mask, int length)
return len;
}
+
+#if !HAVE_IFADDRS && TARGET_ANDROID
+// This structure is exactly the same as struct ifaddrs defined in ifaddrs.h but since the header
+// might not be available (e.g., in bionics used in Android before API 24) we need to mirror it here
+// so that we can dynamically load the getifaddrs function and use it.
+struct ifaddrs
+{
+ struct ifaddrs *ifa_next;
+ char *ifa_name;
+ unsigned int ifa_flags;
+ struct sockaddr *ifa_addr;
+ struct sockaddr *ifa_netmask;
+ union
+ {
+ struct sockaddr *ifu_broadaddr;
+ struct sockaddr *ifu_dstaddr;
+ } ifa_ifu;
+ void *ifa_data;
+};
+#endif
+
+#if !HAVE_GETIFADDRS && TARGET_ANDROID
+// Try to load the getifaddrs and freeifaddrs functions manually.
+// This workaround is necessary on Android prior to API 24 and it can be removed once
+// we drop support for earlier Android versions.
+static int (*getifaddrs)(struct ifaddrs**) = NULL;
+static void (*freeifaddrs)(struct ifaddrs*) = NULL;
+
+static void try_loading_getifaddrs()
+{
+ void *libc = dlopen("libc.so", RTLD_NOW);
+ if (libc)
+ {
+ getifaddrs = (int (*)(struct ifaddrs**)) dlsym(libc, "getifaddrs");
+ freeifaddrs = (void (*)(struct ifaddrs*)) dlsym(libc, "freeifaddrs");
+ }
+}
+
+static bool ensure_getifaddrs_is_loaded()
+{
+ static pthread_once_t getifaddrs_is_loaded = PTHREAD_ONCE_INIT;
+ pthread_once(&getifaddrs_is_loaded, try_loading_getifaddrs);
+ return getifaddrs != NULL && freeifaddrs != NULL;
+}
#endif
int32_t SystemNative_EnumerateInterfaceAddresses(void* context,
@@ -100,7 +151,16 @@ int32_t SystemNative_EnumerateInterfaceAddresses(void* context,
IPv6AddressFound onIpv6Found,
LinkLayerAddressFound onLinkLayerFound)
{
-#if HAVE_GETIFADDRS
+#if !HAVE_GETIFADDRS && TARGET_ANDROID
+ // Workaround for Android API < 24
+ if (!ensure_getifaddrs_is_loaded())
+ {
+ errno = ENOTSUP;
+ return -1;
+ }
+#endif
+
+#if HAVE_GETIFADDRS || TARGET_ANDROID
struct ifaddrs* headAddr;
if (getifaddrs(&headAddr) == -1)
{
@@ -203,7 +263,7 @@ int32_t SystemNative_EnumerateInterfaceAddresses(void* context,
lla.NumAddressBytes = sadl->sdl_alen;
lla.HardwareType = MapHardwareType(sadl->sdl_type);
-#if HAVE_NET_IFMEDIA_H
+#if HAVE_NET_IFMEDIA_H || HAVE_IOS_NET_IFMEDIA_H
if (lla.HardwareType == NetworkInterfaceType_Ethernet)
{
// WI-FI and Ethernet have same address type so we can try to distinguish more
@@ -233,7 +293,7 @@ int32_t SystemNative_EnumerateInterfaceAddresses(void* context,
freeifaddrs(headAddr);
return 0;
#else
- // Not supported on e.g. Android. Also, prevent a compiler error because parameters are unused
+ // Not supported. Also, prevent a compiler error because parameters are unused
(void)context;
(void)onIpv4Found;
(void)onIpv6Found;
@@ -245,7 +305,16 @@ int32_t SystemNative_EnumerateInterfaceAddresses(void* context,
int32_t SystemNative_GetNetworkInterfaces(int32_t * interfaceCount, NetworkInterfaceInfo **interfaceList, int32_t * addressCount, IpAddressInfo **addressList )
{
-#if HAVE_GETIFADDRS
+#if !HAVE_GETIFADDRS && TARGET_ANDROID
+ // Workaround for Android API < 24
+ if (!ensure_getifaddrs_is_loaded())
+ {
+ errno = ENOTSUP;
+ return -1;
+ }
+#endif
+
+#if HAVE_GETIFADDRS || TARGET_ANDROID
struct ifaddrs* head; // Pointer to block allocated by getifaddrs().
struct ifaddrs* ifaddrsEntry;
IpAddressInfo *ai;
@@ -451,7 +520,7 @@ int32_t SystemNative_GetNetworkInterfaces(int32_t * interfaceCount, NetworkInter
return 0;
#else
- // Not supported on e.g. Android. Also, prevent a compiler error because parameters are unused
+ // Not supported. Also, prevent a compiler error because parameters are unused
(void)interfaceCount;
(void)interfaceList;
(void)addressCount;
diff --git a/src/libraries/Native/Unix/System.Native/pal_io.c b/src/libraries/Native/Unix/System.Native/pal_io.c
index 51d841ffc55bdb..3541a90f1858bb 100644
--- a/src/libraries/Native/Unix/System.Native/pal_io.c
+++ b/src/libraries/Native/Unix/System.Native/pal_io.c
@@ -324,6 +324,12 @@ int32_t SystemNative_Unlink(const char* path)
intptr_t SystemNative_ShmOpen(const char* name, int32_t flags, int32_t mode)
{
+#if defined(SHM_NAME_MAX) // macOS
+ assert(strlen(name) <= SHM_NAME_MAX);
+#elif defined(PATH_MAX) // other Unixes
+ assert(strlen(name) <= PATH_MAX);
+#endif
+
#if HAVE_SHM_OPEN_THAT_WORKS_WELL_ENOUGH_WITH_MMAP
flags = ConvertOpenFlags(flags);
if (flags == -1)
@@ -1008,83 +1014,35 @@ int32_t SystemNative_PosixFAdvise(intptr_t fd, int64_t offset, int64_t length, i
#endif
}
-int32_t SystemNative_PosixFAllocate(intptr_t fd, int64_t offset, int64_t length)
+int32_t SystemNative_FAllocate(intptr_t fd, int64_t offset, int64_t length)
{
assert_msg(offset == 0, "Invalid offset value", (int)offset);
- int fileDescriptor = ToFileDescriptor(fd);
int32_t result;
-#if HAVE_POSIX_FALLOCATE64 // 64-bit Linux
- while ((result = posix_fallocate64(fileDescriptor, (off64_t)offset, (off64_t)length)) == EINTR);
-#elif HAVE_POSIX_FALLOCATE // 32-bit Linux
- while ((result = posix_fallocate(fileDescriptor, (off_t)offset, (off_t)length)) == EINTR);
+#if HAVE_FALLOCATE // Linux
+ int fileDescriptor = ToFileDescriptor(fd);
+ while ((result = fallocate(fileDescriptor, FALLOC_FL_KEEP_SIZE, (off_t)offset, (off_t)length)) == EINTR);
#elif defined(F_PREALLOCATE) // macOS
+ int fileDescriptor = ToFileDescriptor(fd);
fstore_t fstore;
- fstore.fst_flags = F_ALLOCATECONTIG; // ensure contiguous space
- fstore.fst_posmode = F_PEOFPOSMODE; // allocate from the physical end of file, as offset MUST NOT be 0 for F_VOLPOSMODE
+ fstore.fst_flags = F_ALLOCATEALL; // Allocate all requested space or no space at all.
+ fstore.fst_posmode = F_PEOFPOSMODE; // Allocate from the physical end of file.
fstore.fst_offset = (off_t)offset;
fstore.fst_length = (off_t)length;
fstore.fst_bytesalloc = 0; // output size, can be > length
while ((result = fcntl(fileDescriptor, F_PREALLOCATE, &fstore)) == -1 && errno == EINTR);
-
- if (result == -1)
- {
- // we have failed to allocate contiguous space, let's try non-contiguous
- fstore.fst_flags = F_ALLOCATEALL; // all or nothing
- while ((result = fcntl(fileDescriptor, F_PREALLOCATE, &fstore)) == -1 && errno == EINTR);
- }
-#elif defined(F_ALLOCSP) || defined(F_ALLOCSP64) // FreeBSD
- #if HAVE_FLOCK64
- struct flock64 lockArgs;
- int command = F_ALLOCSP64;
- #else
- struct flock lockArgs;
- int command = F_ALLOCSP;
- #endif
-
- lockArgs.l_whence = SEEK_SET;
- lockArgs.l_start = (off_t)offset;
- lockArgs.l_len = (off_t)length;
-
- while ((result = fcntl(fileDescriptor, command, &lockArgs)) == -1 && errno == EINTR);
+#else
+ (void)fd; // unused
+ (void)offset; // unused
+ (void)length; // unused
+ result = -1;
+ errno = EOPNOTSUPP;
#endif
-#if defined(F_PREALLOCATE) || defined(F_ALLOCSP) || defined(F_ALLOCSP64)
- // most of the Unixes implement posix_fallocate which does NOT set the last error
- // fctnl does, but to mimic the posix_fallocate behaviour we just return error
- if (result == -1)
- {
- result = errno;
- }
- else
- {
- // align the behaviour with what posix_fallocate does (change reported file size)
- ftruncate(fileDescriptor, length);
- }
-#endif
+ assert(result == 0 || errno != EINVAL);
- // error codes can be OS-specific, so this is why this handling is done here rather than in the managed layer
- switch (result)
- {
- case ENOSPC: // there was not enough space
- return -1;
- case EFBIG: // the file was too large
- return -2;
- case ENODEV: // not a regular file
- case ESPIPE: // a pipe
- // We ignore it, as FileStream contract makes it clear that allocationSize is ignored for non-regular files.
- return 0;
- case EINVAL:
- // We control the offset and length so they are correct.
- assert_msg(length >= 0, "Invalid length value", (int)length);
- // But if the underlying filesystem does not support the operation, we just ignore it and treat as a hint.
- return 0;
- default:
- assert(result != EINTR); // it can't happen here as we retry the call on EINTR
- assert(result != EBADF); // it can't happen here as this method is being called after a succesfull call to open (with write permissions) before returning the SafeFileHandle to the user
- return 0;
- }
+ return result;
}
int32_t SystemNative_Read(intptr_t fd, void* buffer, int32_t bufferSize)
@@ -1427,6 +1385,7 @@ int64_t SystemNative_GetFileSystemType(intptr_t fd)
else if (strcmp(statfsArgs.f_basetype, "befs") == 0) result = 0x42465331;
else if (strcmp(statfsArgs.f_basetype, "bdevfs") == 0) result = 0x62646576;
else if (strcmp(statfsArgs.f_basetype, "bfs") == 0) result = 0x1BADFACE;
+ else if (strcmp(statfsArgs.f_basetype, "bpf_fs") == 0) result = 0xCAFE4A11;
else if (strcmp(statfsArgs.f_basetype, "binfmt_misc") == 0) result = 0x42494E4D;
else if (strcmp(statfsArgs.f_basetype, "bootfs") == 0) result = 0xA56D3FF9;
else if (strcmp(statfsArgs.f_basetype, "btrfs") == 0) result = 0x9123683E;
@@ -1452,6 +1411,7 @@ int64_t SystemNative_GetFileSystemType(intptr_t fd)
else if (strcmp(statfsArgs.f_basetype, "ext2") == 0) result = 0xEF53;
else if (strcmp(statfsArgs.f_basetype, "ext3") == 0) result = 0xEF53;
else if (strcmp(statfsArgs.f_basetype, "ext4") == 0) result = 0xEF53;
+ else if (strcmp(statfsArgs.f_basetype, "f2fs") == 0) result = 0xF2F52010;
else if (strcmp(statfsArgs.f_basetype, "fat") == 0) result = 0x4006;
else if (strcmp(statfsArgs.f_basetype, "fd") == 0) result = 0xF00D1E;
else if (strcmp(statfsArgs.f_basetype, "fhgfs") == 0) result = 0x19830326;
@@ -1519,6 +1479,7 @@ int64_t SystemNative_GetFileSystemType(intptr_t fd)
else if (strcmp(statfsArgs.f_basetype, "sysv2") == 0) result = 0x012FF7B6;
else if (strcmp(statfsArgs.f_basetype, "sysv4") == 0) result = 0x012FF7B5;
else if (strcmp(statfsArgs.f_basetype, "tmpfs") == 0) result = 0x01021994;
+ else if (strcmp(statfsArgs.f_basetype, "tracefs") == 0) result = 0x74726163;
else if (strcmp(statfsArgs.f_basetype, "ubifs") == 0) result = 0x24051905;
else if (strcmp(statfsArgs.f_basetype, "udf") == 0) result = 0x15013346;
else if (strcmp(statfsArgs.f_basetype, "ufs") == 0) result = 0x00011954;
@@ -1560,13 +1521,21 @@ int32_t SystemNative_LockFileRegion(intptr_t fd, int64_t offset, int64_t length,
struct flock lockArgs;
#endif
+#if defined(TARGET_ANDROID) && defined(HAVE_FLOCK64)
+ // On Android, fcntl is always implemented by fcntl64 but before https://github.com/aosp-mirror/platform_bionic/commit/09e77f35ab8d291bf88302bb9673aaa518c6bcb0
+ // there was no remapping of F_SETLK to F_SETLK64 when _FILE_OFFSET_BITS=64 (which we set in eng/native/configurecompiler.cmake) so we need to always pass F_SETLK64
+ int command = F_SETLK64;
+#else
+ int command = F_SETLK;
+#endif
+
lockArgs.l_type = unixLockType;
lockArgs.l_whence = SEEK_SET;
lockArgs.l_start = (off_t)offset;
lockArgs.l_len = (off_t)length;
int32_t ret;
- while ((ret = fcntl (ToFileDescriptor(fd), F_SETLK, &lockArgs)) < 0 && errno == EINTR);
+ while ((ret = fcntl (ToFileDescriptor(fd), command, &lockArgs)) < 0 && errno == EINTR);
return ret;
}
diff --git a/src/libraries/Native/Unix/System.Native/pal_io.h b/src/libraries/Native/Unix/System.Native/pal_io.h
index 3f0db054d4368b..0e5d4cae2feb8f 100644
--- a/src/libraries/Native/Unix/System.Native/pal_io.h
+++ b/src/libraries/Native/Unix/System.Native/pal_io.h
@@ -620,11 +620,11 @@ PALEXPORT int32_t SystemNative_Poll(PollEvent* pollEvents, uint32_t eventCount,
PALEXPORT int32_t SystemNative_PosixFAdvise(intptr_t fd, int64_t offset, int64_t length, int32_t advice);
/**
- * Ensures that disk space is allocated.
+ * Preallocates disk space.
*
- * Returns -1 on ENOSPC, -2 on EFBIG. On success or ignorable error, 0 is returned.
+ * Returns 0 for success, -1 for failure. Sets errno on failure.
*/
-PALEXPORT int32_t SystemNative_PosixFAllocate(intptr_t fd, int64_t offset, int64_t length);
+PALEXPORT int32_t SystemNative_FAllocate(intptr_t fd, int64_t offset, int64_t length);
/**
* Reads the number of bytes specified into the provided buffer from the specified, opened file descriptor.
diff --git a/src/libraries/Native/Unix/System.Native/pal_networkstatistics.c b/src/libraries/Native/Unix/System.Native/pal_networkstatistics.c
index c0ab5dfc3ad94a..33bb76b1583a90 100644
--- a/src/libraries/Native/Unix/System.Native/pal_networkstatistics.c
+++ b/src/libraries/Native/Unix/System.Native/pal_networkstatistics.c
@@ -36,6 +36,9 @@
#if HAVE_NET_IFMEDIA_H
#include
#include
+#elif HAVE_IOS_NET_IFMEDIA_H
+#include "ios/net/if_media.h"
+#include
#endif
#include
#include
@@ -44,6 +47,8 @@
#include
#if HAVE_NETINET_IP_VAR_H
#include
+#elif HAVE_IOS_NETINET_IP_VAR_H
+#include "ios/netinet/ip_var.h"
#endif
#include
#if HAVE_TCP_FSM_H
@@ -53,10 +58,14 @@
#include
#if HAVE_NETINET_UDP_VAR_H
#include
+#elif HAVE_IOS_NETINET_UDP_VAR_H
+#include "ios/netinet/udp_var.h"
#endif
#include
#if HAVE_NETINET_ICMP_VAR_H
#include
+#elif HAVE_IOS_NETINET_ICMP_VAR_H
+#include "ios/netinet/icmp_var.h"
#endif
static _Atomic(int) icmp6statSize = sizeof(struct icmp6stat);
@@ -105,7 +114,7 @@ int32_t SystemNative_GetTcpGlobalStatistics(TcpGlobalStatistics* retStats)
int32_t SystemNative_GetIPv4GlobalStatistics(IPv4GlobalStatistics* retStats)
{
-#if HAVE_NETINET_IP_VAR_H
+#if HAVE_NETINET_IP_VAR_H || HAVE_IOS_NETINET_IP_VAR_H
size_t oldlenp;
assert(retStats != NULL);
@@ -154,7 +163,7 @@ int32_t SystemNative_GetIPv4GlobalStatistics(IPv4GlobalStatistics* retStats)
int32_t SystemNative_GetUdpGlobalStatistics(UdpGlobalStatistics* retStats)
{
-#if HAVE_NETINET_UDP_VAR_H
+#if HAVE_NETINET_UDP_VAR_H || HAVE_IOS_NETINET_UDP_VAR_H
size_t oldlenp;
assert(retStats != NULL);
@@ -194,7 +203,7 @@ int32_t SystemNative_GetUdpGlobalStatistics(UdpGlobalStatistics* retStats)
int32_t SystemNative_GetIcmpv4GlobalStatistics(Icmpv4GlobalStatistics* retStats)
{
-#if HAVE_NETINET_ICMP_VAR_H
+#if HAVE_NETINET_ICMP_VAR_H || HAVE_IOS_NETINET_ICMP_VAR_H
size_t oldlenp;
assert(retStats != NULL);
@@ -587,7 +596,7 @@ int32_t SystemNative_GetNativeIPInterfaceStatistics(char* interfaceName, NativeI
if (ifHdr->ifm_flags & IFF_UP)
{
retStats->Flags |= InterfaceUp;
-#if HAVE_NET_IFMEDIA_H
+#if HAVE_NET_IFMEDIA_H || HAVE_IOS_NET_IFMEDIA_H
int fd = socket(AF_INET, SOCK_DGRAM, 0);
if (fd < 0) {
retStats->Flags |= InterfaceError;
diff --git a/src/libraries/Native/Unix/System.Native/pal_process.c b/src/libraries/Native/Unix/System.Native/pal_process.c
index 5e97d958f74d17..fabdfae76187ca 100644
--- a/src/libraries/Native/Unix/System.Native/pal_process.c
+++ b/src/libraries/Native/Unix/System.Native/pal_process.c
@@ -191,6 +191,24 @@ static int SetGroups(uint32_t* userGroups, int32_t userGroupsLength, uint32_t* p
return rv;
}
+typedef void (*VoidIntFn)(int);
+
+static
+VoidIntFn
+handler_from_sigaction (struct sigaction *sa)
+{
+ if (((unsigned int)sa->sa_flags) & SA_SIGINFO)
+ {
+ // work around -Wcast-function-type
+ void (*tmp)(void) = (void (*)(void))sa->sa_sigaction;
+ return (void (*)(int))tmp;
+ }
+ else
+ {
+ return sa->sa_handler;
+ }
+}
+
int32_t SystemNative_ForkAndExecProcess(const char* filename,
char* const argv[],
char* const envp[],
@@ -371,7 +389,7 @@ int32_t SystemNative_ForkAndExecProcess(const char* filename,
}
if (!sigaction(sig, NULL, &sa_old))
{
- void (*oldhandler)(int) = (((unsigned int)sa_old.sa_flags) & SA_SIGINFO) ? (void (*)(int))sa_old.sa_sigaction : sa_old.sa_handler;
+ void (*oldhandler)(int) = handler_from_sigaction (&sa_old);
if (oldhandler != SIG_IGN && oldhandler != SIG_DFL)
{
// It has a custom handler, put the default handler back.
diff --git a/src/libraries/Native/Unix/System.Native/pal_searchpath.c b/src/libraries/Native/Unix/System.Native/pal_searchpath.c
index fbf3d903df01c7..de8037dc1a2959 100644
--- a/src/libraries/Native/Unix/System.Native/pal_searchpath.c
+++ b/src/libraries/Native/Unix/System.Native/pal_searchpath.c
@@ -10,3 +10,9 @@ const char* SystemNative_SearchPath(int32_t folderId)
__builtin_unreachable();
return NULL;
}
+
+const char* SystemNative_SearchPath_TempDirectory()
+{
+ __builtin_unreachable();
+ return NULL;
+}
diff --git a/src/libraries/Native/Unix/System.Native/pal_searchpath.h b/src/libraries/Native/Unix/System.Native/pal_searchpath.h
index e2de05d8c8860a..cdb872914624ca 100644
--- a/src/libraries/Native/Unix/System.Native/pal_searchpath.h
+++ b/src/libraries/Native/Unix/System.Native/pal_searchpath.h
@@ -7,3 +7,5 @@
#include "pal_types.h"
PALEXPORT const char* SystemNative_SearchPath(int32_t folderId);
+
+PALEXPORT const char* SystemNative_SearchPath_TempDirectory(void);
diff --git a/src/libraries/Native/Unix/System.Native/pal_searchpath.m b/src/libraries/Native/Unix/System.Native/pal_searchpath.m
index 2e96041f3dda82..231c508c527cab 100644
--- a/src/libraries/Native/Unix/System.Native/pal_searchpath.m
+++ b/src/libraries/Native/Unix/System.Native/pal_searchpath.m
@@ -11,3 +11,10 @@
const char* path = [[url path] UTF8String];
return path == NULL ? NULL : strdup (path);
}
+
+const char* SystemNative_SearchPath_TempDirectory()
+{
+ NSString* tempPath = NSTemporaryDirectory();
+ const char *path = [tempPath UTF8String];
+ return path == NULL ? NULL : strdup (path);
+}
diff --git a/src/libraries/Native/Unix/System.Native/pal_signal.h b/src/libraries/Native/Unix/System.Native/pal_signal.h
index 146fdabbfceb14..c3c21009dc836c 100644
--- a/src/libraries/Native/Unix/System.Native/pal_signal.h
+++ b/src/libraries/Native/Unix/System.Native/pal_signal.h
@@ -40,8 +40,8 @@ typedef enum
PosixSignalSIGQUIT = -3,
PosixSignalSIGTERM = -4,
PosixSignalSIGCHLD = -5,
- PosixSignalSIGWINCH = -6,
- PosixSignalSIGCONT = -7,
+ PosixSignalSIGCONT = -6,
+ PosixSignalSIGWINCH = -7,
PosixSignalSIGTTIN = -8,
PosixSignalSIGTTOU = -9,
PosixSignalSIGTSTP = -10
diff --git a/src/libraries/Native/Unix/System.Native/pal_tcpstate.c b/src/libraries/Native/Unix/System.Native/pal_tcpstate.c
index 5b428ba6c8f11b..db5f775164c4c8 100644
--- a/src/libraries/Native/Unix/System.Native/pal_tcpstate.c
+++ b/src/libraries/Native/Unix/System.Native/pal_tcpstate.c
@@ -7,6 +7,8 @@
#if HAVE_TCP_FSM_H
#include
+#elif HAVE_IOS_NETINET_TCPFSM_H
+#include "ios/netinet/tcp_fsm.h"
#elif HAVE_TCP_H_TCPSTATE_ENUM
#include
#endif
@@ -15,7 +17,7 @@ int32_t SystemNative_MapTcpState(int32_t tcpState)
{
switch (tcpState)
{
-#if HAVE_TCP_FSM_H
+#if HAVE_TCP_FSM_H || HAVE_IOS_NETINET_TCPFSM_H
case TCPS_CLOSED:
return TcpState_Closed;
case TCPS_LISTEN:
diff --git a/src/libraries/Native/Unix/System.Net.Security.Native/pal_gssapi.c b/src/libraries/Native/Unix/System.Net.Security.Native/pal_gssapi.c
index d5b0e0bcdda1b3..ef84a024777d3c 100644
--- a/src/libraries/Native/Unix/System.Net.Security.Native/pal_gssapi.c
+++ b/src/libraries/Native/Unix/System.Net.Security.Native/pal_gssapi.c
@@ -123,7 +123,7 @@ static void* volatile s_gssLib = NULL;
#define GSS_C_NT_HOSTBASED_SERVICE (*GSS_C_NT_HOSTBASED_SERVICE_ptr)
#define gss_mech_krb5 (*gss_mech_krb5_ptr)
-#define gss_lib_name "libgssapi_krb5.so"
+#define gss_lib_name "libgssapi_krb5.so.2"
static int32_t ensure_gss_shim_initialized()
{
diff --git a/src/libraries/Native/Unix/System.Security.Cryptography.Native.Android/pal_sslstream.c b/src/libraries/Native/Unix/System.Security.Cryptography.Native.Android/pal_sslstream.c
index 4b95faf7a191bd..d9054e5c46f33a 100644
--- a/src/libraries/Native/Unix/System.Security.Cryptography.Native.Android/pal_sslstream.c
+++ b/src/libraries/Native/Unix/System.Security.Cryptography.Native.Android/pal_sslstream.c
@@ -585,13 +585,14 @@ AndroidCryptoNative_SSLStreamRead(SSLStream* sslStream, uint8_t* buffer, int32_t
if (rem > 0)
{
- data = make_java_byte_array(env, rem);
+ int32_t bytes_to_read = rem < length ? rem : length;
+ data = make_java_byte_array(env, bytes_to_read);
IGNORE_RETURN((*env)->CallObjectMethod(env, sslStream->appInBuffer, g_ByteBufferGet, data));
ON_EXCEPTION_PRINT_AND_GOTO(cleanup);
IGNORE_RETURN((*env)->CallObjectMethod(env, sslStream->appInBuffer, g_ByteBufferCompact));
ON_EXCEPTION_PRINT_AND_GOTO(cleanup);
- (*env)->GetByteArrayRegion(env, data, 0, rem, (jbyte*)buffer);
- *read = rem;
+ (*env)->GetByteArrayRegion(env, data, 0, bytes_to_read, (jbyte*)buffer);
+ *read = bytes_to_read;
ret = SSLStreamStatus_OK;
}
else
diff --git a/src/libraries/Native/Unix/System.Security.Cryptography.Native.Apple/pal_ssl.c b/src/libraries/Native/Unix/System.Security.Cryptography.Native.Apple/pal_ssl.c
index 2d66847c1731b3..0770a946bee1ed 100644
--- a/src/libraries/Native/Unix/System.Security.Cryptography.Native.Apple/pal_ssl.c
+++ b/src/libraries/Native/Unix/System.Security.Cryptography.Native.Apple/pal_ssl.c
@@ -596,19 +596,19 @@ int32_t AppleCryptoNative_SslSetEnabledCipherSuites(SSLContextRef sslContext, co
// Max numCipherSuites is 2^16 (all possible cipher suites)
assert(numCipherSuites < (1 << 16));
-#if !defined(TARGET_MACCATALYST) && !defined(TARGET_IOS) && !defined(TARGET_TVOS)
+#if !defined(TARGET_ARM64) && !defined(TARGET_IOS) && !defined(TARGET_TVOS)
if (sizeof(SSLCipherSuite) == sizeof(uint32_t))
{
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
- // macOS
+ // macOS & MacCatalyst x64
return SSLSetEnabledCiphers(sslContext, (const SSLCipherSuite *)cipherSuites, (size_t)numCipherSuites);
#pragma clang diagnostic pop
}
else
#endif
{
- // MacCatalyst, iOS, tvOS, watchOS
+ // MacCatalyst arm64, iOS, tvOS, watchOS
SSLCipherSuite* cipherSuites16 = (SSLCipherSuite*)calloc((size_t)numCipherSuites, sizeof(SSLCipherSuite));
if (cipherSuites16 == NULL)
diff --git a/src/libraries/Native/Unix/System.Security.Cryptography.Native.Apple/pal_x509chain.c b/src/libraries/Native/Unix/System.Security.Cryptography.Native.Apple/pal_x509chain.c
index ec12984bb3a9c5..06f09cfd9f47a8 100644
--- a/src/libraries/Native/Unix/System.Security.Cryptography.Native.Apple/pal_x509chain.c
+++ b/src/libraries/Native/Unix/System.Security.Cryptography.Native.Apple/pal_x509chain.c
@@ -195,7 +195,7 @@ static void MergeStatusCodes(CFTypeRef key, CFTypeRef value, void* context)
}
else if (CFEqual(keyString, CFSTR("NonEmptySubject")) || CFEqual(keyString, CFSTR("GrayListedKey")) ||
CFEqual(keyString, CFSTR("CTRequired")) || CFEqual(keyString, CFSTR("GrayListedLeaf")) ||
- CFEqual(keyString, CFSTR("IdLinkage")))
+ CFEqual(keyString, CFSTR("IdLinkage")) || CFEqual(keyString, CFSTR("DuplicateExtension")))
{
// Not a "problem" that we report.
}
diff --git a/src/libraries/Native/Unix/System.Security.Cryptography.Native/openssl.c b/src/libraries/Native/Unix/System.Security.Cryptography.Native/openssl.c
index ad93dbf74d87d7..c18eb0ffb7c6bb 100644
--- a/src/libraries/Native/Unix/System.Security.Cryptography.Native/openssl.c
+++ b/src/libraries/Native/Unix/System.Security.Cryptography.Native/openssl.c
@@ -564,7 +564,7 @@ BIO* CryptoNative_GetX509NameInfo(X509* x509, int32_t nameType, int32_t forIssue
if (answer)
{
BIO* b = BIO_new(BIO_s_mem());
- ASN1_STRING_print_ex(b, answer, 0);
+ ASN1_STRING_print_ex(b, answer, ASN1_STRFLGS_UTF8_CONVERT);
return b;
}
}
@@ -646,7 +646,7 @@ BIO* CryptoNative_GetX509NameInfo(X509* x509, int32_t nameType, int32_t forIssue
if (str)
{
BIO* b = BIO_new(BIO_s_mem());
- ASN1_STRING_print_ex(b, str, 0);
+ ASN1_STRING_print_ex(b, str, ASN1_STRFLGS_UTF8_CONVERT);
sk_GENERAL_NAME_free(altNames);
return b;
}
@@ -1068,27 +1068,30 @@ int32_t CryptoNative_LookupFriendlyNameByOid(const char* oidValue, const char**
return -2;
}
+ // First, check if oidValue parses as a dotted decimal OID. If not, we'll
+ // return not-found and let the system cache that.
+ int asnRet = a2d_ASN1_OBJECT(NULL, 0, oidValue, -1);
+
+ if (asnRet <= 0)
+ {
+ return 0;
+ }
+
// Do a lookup with no_name set. The purpose of this function is to map only the
// dotted decimal to the friendly name. "sha1" in should not result in "sha1" out.
oid = OBJ_txt2obj(oidValue, 1);
- if (!oid)
+ if (oid == NULL)
{
- unsigned long err = ERR_peek_last_error();
-
- // If the most recent error pushed onto the error queue is NOT from OID parsing
- // then signal for an exception to be thrown.
- if (err != 0 && ERR_GET_FUNC(err) != ASN1_F_A2D_ASN1_OBJECT)
- {
- return -1;
- }
-
- return 0;
+ // We know that the OID parsed (unless it underwent concurrent modification,
+ // which is unsupported), so any error in this stage should be an exception.
+ return -1;
}
// Look in the predefined, and late-registered, OIDs list to get the lookup table
// identifier for this OID. The OBJ_txt2obj object will not have ln set.
nid = OBJ_obj2nid(oid);
+ ASN1_OBJECT_free(oid);
if (nid == NID_undef)
{
diff --git a/src/libraries/Native/Unix/System.Security.Cryptography.Native/opensslshim.h b/src/libraries/Native/Unix/System.Security.Cryptography.Native/opensslshim.h
index 69c95b532ade08..58063bde6c7027 100644
--- a/src/libraries/Native/Unix/System.Security.Cryptography.Native/opensslshim.h
+++ b/src/libraries/Native/Unix/System.Security.Cryptography.Native/opensslshim.h
@@ -159,6 +159,7 @@ const EVP_CIPHER* EVP_chacha20_poly1305(void);
// that needs to be added.
#define FOR_ALL_OPENSSL_FUNCTIONS \
+ REQUIRED_FUNCTION(a2d_ASN1_OBJECT) \
REQUIRED_FUNCTION(ASN1_BIT_STRING_free) \
REQUIRED_FUNCTION(ASN1_d2i_bio) \
REQUIRED_FUNCTION(ASN1_i2d_bio) \
@@ -269,6 +270,7 @@ const EVP_CIPHER* EVP_chacha20_poly1305(void);
LEGACY_FUNCTION(ERR_load_crypto_strings) \
LIGHTUP_FUNCTION(ERR_new) \
REQUIRED_FUNCTION(ERR_peek_error) \
+ REQUIRED_FUNCTION(ERR_peek_error_line) \
REQUIRED_FUNCTION(ERR_peek_last_error) \
FALLBACK_FUNCTION(ERR_put_error) \
REQUIRED_FUNCTION(ERR_reason_error_string) \
@@ -607,6 +609,7 @@ FOR_ALL_OPENSSL_FUNCTIONS
// Redefine all calls to OpenSSL functions as calls through pointers that are set
// to the functions from the libssl.so selected by the shim.
+#define a2d_ASN1_OBJECT a2d_ASN1_OBJECT_ptr
#define ASN1_BIT_STRING_free ASN1_BIT_STRING_free_ptr
#define ASN1_GENERALIZEDTIME_free ASN1_GENERALIZEDTIME_free_ptr
#define ASN1_d2i_bio ASN1_d2i_bio_ptr
@@ -717,6 +720,7 @@ FOR_ALL_OPENSSL_FUNCTIONS
#define ERR_load_crypto_strings ERR_load_crypto_strings_ptr
#define ERR_new ERR_new_ptr
#define ERR_peek_error ERR_peek_error_ptr
+#define ERR_peek_error_line ERR_peek_error_line_ptr
#define ERR_peek_last_error ERR_peek_last_error_ptr
#define ERR_put_error ERR_put_error_ptr
#define ERR_reason_error_string ERR_reason_error_string_ptr
diff --git a/src/libraries/Native/Unix/System.Security.Cryptography.Native/pal_evp_pkey.c b/src/libraries/Native/Unix/System.Security.Cryptography.Native/pal_evp_pkey.c
index 6839d4c2fe04ef..79de386f097215 100644
--- a/src/libraries/Native/Unix/System.Security.Cryptography.Native/pal_evp_pkey.c
+++ b/src/libraries/Native/Unix/System.Security.Cryptography.Native/pal_evp_pkey.c
@@ -152,20 +152,59 @@ EVP_PKEY* CryptoNative_DecodePkcs8PrivateKey(const uint8_t* buf, int32_t len, in
return key;
}
-int32_t CryptoNative_GetPkcs8PrivateKeySize(EVP_PKEY* pkey)
+int32_t CryptoNative_GetPkcs8PrivateKeySize(EVP_PKEY* pkey, int32_t* p8size)
{
assert(pkey != NULL);
+ assert(p8size != NULL);
+
+ *p8size = 0;
+ ERR_clear_error();
PKCS8_PRIV_KEY_INFO* p8 = EVP_PKEY2PKCS8(pkey);
if (p8 == NULL)
{
+ // OpenSSL 1.1 and 3 have a behavioral change with EVP_PKEY2PKCS8
+ // with regard to handling EVP_PKEYs that do not contain a private key.
+ //
+ // In OpenSSL 1.1, it would always succeed, but the private parameters
+ // would be missing (thus making an invalid PKCS8 structure).
+ // Over in the managed side, we detect these invalid PKCS8 blobs and
+ // convert that to a "no private key" error.
+ //
+ // In OpenSSL 3, this now correctly errors, with the error
+ // ASN1_R_ILLEGAL_ZERO_CONTENT. We want to preserve allocation failures
+ // as OutOfMemoryException. So we peek at the error. If it's a malloc
+ // failure, -1 is returned to indcate "throw what is on the error queue".
+ // If the error is not a malloc failure, return -2 to mean "no private key".
+ // If OpenSSL ever changes the error to something more to explicitly mean
+ // "no private key" then we should test for that explicitly. Until then,
+ // we treat all errors, except a malloc error, to mean "no private key".
+
+ const char* file = NULL;
+ int line = 0;
+ unsigned long error = ERR_peek_error_line(&file, &line);
+
+ // If it's not a malloc failure, assume it's because the private key is
+ // missing.
+ if (ERR_GET_REASON(error) != ERR_R_MALLOC_FAILURE)
+ {
+ ERR_clear_error();
+ return -2;
+ }
+
+ // It is a malloc failure. Clear the error queue and set the error
+ // as a malloc error so it's the only error in the queue.
+ ERR_clear_error();
+ ERR_put_error(ERR_GET_LIB(error), 0, ERR_R_MALLOC_FAILURE, file, line);
+
return -1;
}
- int ret = i2d_PKCS8_PRIV_KEY_INFO(p8, NULL);
+ *p8size = i2d_PKCS8_PRIV_KEY_INFO(p8, NULL);
PKCS8_PRIV_KEY_INFO_free(p8);
- return ret;
+
+ return *p8size < 0 ? -1 : 1;
}
int32_t CryptoNative_EncodePkcs8PrivateKey(EVP_PKEY* pkey, uint8_t* buf)
diff --git a/src/libraries/Native/Unix/System.Security.Cryptography.Native/pal_evp_pkey.h b/src/libraries/Native/Unix/System.Security.Cryptography.Native/pal_evp_pkey.h
index 012ac98e03db20..fac7ee32b5bbcc 100644
--- a/src/libraries/Native/Unix/System.Security.Cryptography.Native/pal_evp_pkey.h
+++ b/src/libraries/Native/Unix/System.Security.Cryptography.Native/pal_evp_pkey.h
@@ -58,9 +58,13 @@ Requres a non-null buf, and len > 0.
PALEXPORT EVP_PKEY* CryptoNative_DecodePkcs8PrivateKey(const uint8_t* buf, int32_t len, int32_t algId);
/*
-Reports the number of bytes rqeuired to encode an EVP_PKEY* as a Pkcs8PrivateKeyInfo, or a negative value on error.
+Gets the number of bytes rqeuired to encode an EVP_PKEY* as a Pkcs8PrivateKeyInfo.
+
+On success, 1 is returned and p8size contains the size of the Pkcs8PrivateKeyInfo.
+On failure, -1 is used to indicate the openssl error queue contains the error.
+On failure, -2 is used to indcate that the supplied EVP_PKEY* is possibly missing a private key.
*/
-PALEXPORT int32_t CryptoNative_GetPkcs8PrivateKeySize(EVP_PKEY* pkey);
+PALEXPORT int32_t CryptoNative_GetPkcs8PrivateKeySize(EVP_PKEY* pkey, int32_t* p8size);
/*
Encodes the EVP_PKEY* as a Pkcs8PrivateKeyInfo, writing the encoded value to buf.
diff --git a/src/libraries/Native/Unix/configure.cmake b/src/libraries/Native/Unix/configure.cmake
index 18afacc2dbc59c..e00b35d0f9e1f1 100644
--- a/src/libraries/Native/Unix/configure.cmake
+++ b/src/libraries/Native/Unix/configure.cmake
@@ -7,6 +7,7 @@ include(CheckStructHasMember)
include(CheckSymbolExists)
include(CheckTypeSize)
include(CheckLibraryExists)
+include(CheckFunctionExists)
# CMP0075 Include file check macros honor CMAKE_REQUIRED_LIBRARIES.
if(POLICY CMP0075)
@@ -141,6 +142,18 @@ check_c_source_compiles(
"
HAVE_FLOCK64)
+check_c_source_compiles(
+ "
+ #include
+ #include
+ int main(void)
+ {
+ struct ifaddrs ia;
+ return 0;
+ }
+ "
+ HAVE_IFADDRS)
+
check_symbol_exists(
O_CLOEXEC
fcntl.h
@@ -156,9 +169,8 @@ check_symbol_exists(
fcntl.h
HAVE_F_FULLFSYNC)
-check_symbol_exists(
+check_function_exists(
getifaddrs
- ifaddrs.h
HAVE_GETIFADDRS)
check_symbol_exists(
@@ -232,14 +244,9 @@ check_symbol_exists(
HAVE_POSIX_ADVISE)
check_symbol_exists(
- posix_fallocate
- fcntl.h
- HAVE_POSIX_FALLOCATE)
-
-check_symbol_exists(
- posix_fallocate64
+ fallocate
fcntl.h
- HAVE_POSIX_FALLOCATE64)
+ HAVE_FALLOCATE)
check_symbol_exists(
preadv
@@ -879,7 +886,15 @@ check_symbol_exists(
if(CLR_CMAKE_TARGET_MACCATALYST OR CLR_CMAKE_TARGET_IOS OR CLR_CMAKE_TARGET_TVOS)
set(HAVE_IOS_NET_ROUTE_H 1)
- set(CMAKE_EXTRA_INCLUDE_FILES sys/types.h "${CMAKE_CURRENT_SOURCE_DIR}/System.Native/ios/net/route.h")
+ set(HAVE_IOS_NET_IFMEDIA_H 1)
+ set(HAVE_IOS_NETINET_TCPFSM_H 1)
+ set(HAVE_IOS_NETINET_IP_VAR_H 1)
+ set(HAVE_IOS_NETINET_ICMP_VAR_H 1)
+ set(HAVE_IOS_NETINET_UDP_VAR_H 1)
+ set(CMAKE_EXTRA_INCLUDE_FILES
+ sys/types.h
+ "${CMAKE_CURRENT_SOURCE_DIR}/System.Native/ios/net/route.h"
+ )
else()
set(CMAKE_EXTRA_INCLUDE_FILES sys/types.h net/if.h net/route.h)
endif()
diff --git a/src/libraries/System.CodeDom/src/CompatibilitySuppressions.xml b/src/libraries/System.CodeDom/src/CompatibilitySuppressions.xml
deleted file mode 100644
index 292caf8b32fd1a..00000000000000
--- a/src/libraries/System.CodeDom/src/CompatibilitySuppressions.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
- CP0001
- lib/netstandard2.0/System.CodeDom.dll
- lib/net461/System.CodeDom.dll
-
-
\ No newline at end of file
diff --git a/src/libraries/System.ComponentModel.Annotations/ref/System.ComponentModel.Annotations.cs b/src/libraries/System.ComponentModel.Annotations/ref/System.ComponentModel.Annotations.cs
index aa1912cdb0f9d7..c78333ddf64333 100644
--- a/src/libraries/System.ComponentModel.Annotations/ref/System.ComponentModel.Annotations.cs
+++ b/src/libraries/System.ComponentModel.Annotations/ref/System.ComponentModel.Annotations.cs
@@ -6,15 +6,12 @@
namespace System.ComponentModel.DataAnnotations
{
- // TODO-NULLABLE: Enable after System.ComponentModel.TypeDescriptionProvider is annotated
-#nullable disable
public partial class AssociatedMetadataTypeTypeDescriptionProvider : System.ComponentModel.TypeDescriptionProvider
{
public AssociatedMetadataTypeTypeDescriptionProvider(System.Type type) { }
public AssociatedMetadataTypeTypeDescriptionProvider(System.Type type, [System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembersAttribute(System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.All)] System.Type associatedMetadataType) { }
- public override System.ComponentModel.ICustomTypeDescriptor GetTypeDescriptor([System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembersAttribute(System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.All)] System.Type objectType, object instance) { throw null; }
+ public override System.ComponentModel.ICustomTypeDescriptor GetTypeDescriptor([System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembersAttribute(System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.All)] System.Type objectType, object? instance) { throw null; }
}
-#nullable enable
[System.AttributeUsageAttribute(System.AttributeTargets.Field | System.AttributeTargets.Property, AllowMultiple=false, Inherited=true)]
[System.ObsoleteAttribute("AssociationAttribute has been deprecated and is not supported.")]
public sealed partial class AssociationAttribute : System.Attribute
diff --git a/src/libraries/System.ComponentModel.Annotations/src/System/ComponentModel/DataAnnotations/AssociatedMetadataTypeTypeDescriptionProvider.cs b/src/libraries/System.ComponentModel.Annotations/src/System/ComponentModel/DataAnnotations/AssociatedMetadataTypeTypeDescriptionProvider.cs
index a408e38342083e..fbfe36a6c888b8 100644
--- a/src/libraries/System.ComponentModel.Annotations/src/System/ComponentModel/DataAnnotations/AssociatedMetadataTypeTypeDescriptionProvider.cs
+++ b/src/libraries/System.ComponentModel.Annotations/src/System/ComponentModel/DataAnnotations/AssociatedMetadataTypeTypeDescriptionProvider.cs
@@ -1,9 +1,6 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
-// TODO-NULLABLE: Enable after System.ComponentModel.TypeDescriptionProvider is annotated
-#nullable disable
-
using System.Diagnostics.CodeAnalysis;
namespace System.ComponentModel.DataAnnotations
@@ -15,7 +12,7 @@ namespace System.ComponentModel.DataAnnotations
public class AssociatedMetadataTypeTypeDescriptionProvider : TypeDescriptionProvider
{
[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)]
- private readonly Type _associatedMetadataType;
+ private readonly Type? _associatedMetadataType;
///
/// Initializes a new instance of the System.ComponentModel.DataAnnotations.AssociatedMetadataTypeTypeDescriptionProvider
@@ -53,9 +50,9 @@ public AssociatedMetadataTypeTypeDescriptionProvider(
/// The type of object to retrieve the type descriptor for.
/// An instance of the type.
/// The descriptor that provides metadata for the type.
- public override ICustomTypeDescriptor GetTypeDescriptor([DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)] Type objectType, object instance)
+ public override ICustomTypeDescriptor GetTypeDescriptor([DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)] Type objectType, object? instance)
{
- ICustomTypeDescriptor baseDescriptor = base.GetTypeDescriptor(objectType, instance);
+ ICustomTypeDescriptor? baseDescriptor = base.GetTypeDescriptor(objectType, instance);
return new AssociatedMetadataTypeTypeDescriptor(baseDescriptor, objectType, _associatedMetadataType);
}
}
diff --git a/src/libraries/System.ComponentModel.Annotations/src/System/ComponentModel/DataAnnotations/AssociatedMetadataTypeTypeDescriptor.cs b/src/libraries/System.ComponentModel.Annotations/src/System/ComponentModel/DataAnnotations/AssociatedMetadataTypeTypeDescriptor.cs
index 5c49bd6062f710..ab8b86b13161df 100644
--- a/src/libraries/System.ComponentModel.Annotations/src/System/ComponentModel/DataAnnotations/AssociatedMetadataTypeTypeDescriptor.cs
+++ b/src/libraries/System.ComponentModel.Annotations/src/System/ComponentModel/DataAnnotations/AssociatedMetadataTypeTypeDescriptor.cs
@@ -1,9 +1,6 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
-// TODO-NULLABLE: Enable after System.ComponentModel.TypeDescriptionProvider is annotated
-#nullable disable
-
using System.Collections.Concurrent;
using System.Collections.Generic;
using System.Diagnostics.CodeAnalysis;
@@ -15,14 +12,14 @@ namespace System.ComponentModel.DataAnnotations
internal sealed class AssociatedMetadataTypeTypeDescriptor : CustomTypeDescriptor
{
[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)]
- private Type AssociatedMetadataType { get; set; }
+ private Type? AssociatedMetadataType { get; set; }
private bool IsSelfAssociated { get; set; }
public AssociatedMetadataTypeTypeDescriptor(
- ICustomTypeDescriptor parent,
+ ICustomTypeDescriptor? parent,
[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicProperties)] Type type,
- [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)] Type associatedMetadataType)
+ [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)] Type? associatedMetadataType)
: base(parent)
{
AssociatedMetadataType = associatedMetadataType ?? TypeDescriptorCache.GetAssociatedMetadataType(type);
@@ -34,7 +31,7 @@ public AssociatedMetadataTypeTypeDescriptor(
}
[RequiresUnreferencedCode("PropertyDescriptor's PropertyType cannot be statically discovered. The public parameterless constructor or the 'Default' static field may be trimmed from the Attribute's Type.")]
- public override PropertyDescriptorCollection GetProperties(Attribute[] attributes)
+ public override PropertyDescriptorCollection GetProperties(Attribute[]? attributes)
{
return GetPropertiesWithMetadata(base.GetProperties(attributes));
}
@@ -96,7 +93,7 @@ public override AttributeCollection GetAttributes()
private static class TypeDescriptorCache
{
// Stores the associated metadata type for a type
- private static readonly ConcurrentDictionary s_metadataTypeCache = new ConcurrentDictionary();
+ private static readonly ConcurrentDictionary s_metadataTypeCache = new ConcurrentDictionary();
// Stores the attributes for a member info
private static readonly ConcurrentDictionary<(Type, string), Attribute[]> s_typeMemberCache = new ConcurrentDictionary<(Type, string), Attribute[]>();
@@ -117,16 +114,16 @@ public static void ValidateMetadataType(
}
[return: DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)]
- public static Type GetAssociatedMetadataType(Type type)
+ public static Type? GetAssociatedMetadataType(Type type)
{
- Type associatedMetadataType = null;
+ Type? associatedMetadataType;
if (s_metadataTypeCache.TryGetValue(type, out associatedMetadataType))
{
return associatedMetadataType;
}
// Try association attribute
- MetadataTypeAttribute attribute = (MetadataTypeAttribute)Attribute.GetCustomAttribute(type, typeof(MetadataTypeAttribute));
+ MetadataTypeAttribute? attribute = (MetadataTypeAttribute?)Attribute.GetCustomAttribute(type, typeof(MetadataTypeAttribute));
if (attribute != null)
{
associatedMetadataType = attribute.MetadataClassType;
@@ -164,7 +161,7 @@ public static Attribute[] GetAssociatedMetadata(
string memberName)
{
(Type, string) memberTuple = (type, memberName);
- Attribute[] attributes;
+ Attribute[]? attributes;
if (s_typeMemberCache.TryGetValue(memberTuple, out attributes))
{
return attributes;
@@ -175,7 +172,7 @@ public static Attribute[] GetAssociatedMetadata(
// Only public static/instance members
BindingFlags searchFlags = BindingFlags.Public | BindingFlags.Instance | BindingFlags.Static;
// Try to find a matching member on type
- MemberInfo matchingMember = type.GetMember(memberName, allowedMemberTypes, searchFlags).FirstOrDefault();
+ MemberInfo? matchingMember = type.GetMember(memberName, allowedMemberTypes, searchFlags).FirstOrDefault();
if (matchingMember != null)
{
attributes = Attribute.GetCustomAttributes(matchingMember, true /* inherit */);
diff --git a/src/libraries/System.Configuration.ConfigurationManager/src/CompatibilitySuppressions.xml b/src/libraries/System.Configuration.ConfigurationManager/src/CompatibilitySuppressions.xml
index 5441f0c558b51a..f1cdac2f6519bb 100644
--- a/src/libraries/System.Configuration.ConfigurationManager/src/CompatibilitySuppressions.xml
+++ b/src/libraries/System.Configuration.ConfigurationManager/src/CompatibilitySuppressions.xml
@@ -1,7 +1,38 @@
- CP0001
+ CP0002
+ M:System.Configuration.SettingsAttributeDictionary.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)
+ lib/netstandard2.0/System.Configuration.ConfigurationManager.dll
+ lib/net461/System.Configuration.ConfigurationManager.dll
+
+
+ CP0002
+ M:System.Configuration.SettingsContext.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)
+ lib/netstandard2.0/System.Configuration.ConfigurationManager.dll
+ lib/net461/System.Configuration.ConfigurationManager.dll
+
+
+ CP0002
+ M:System.Configuration.Internal.DelegatingConfigHost.RefreshConfigPaths
+ lib/netstandard2.0/System.Configuration.ConfigurationManager.dll
+ lib/net461/System.Configuration.ConfigurationManager.dll
+
+
+ CP0002
+ M:System.Configuration.Internal.DelegatingConfigHost.get_HasLocalConfig
+ lib/netstandard2.0/System.Configuration.ConfigurationManager.dll
+ lib/net461/System.Configuration.ConfigurationManager.dll
+
+
+ CP0002
+ M:System.Configuration.Internal.DelegatingConfigHost.get_HasRoamingConfig
+ lib/netstandard2.0/System.Configuration.ConfigurationManager.dll
+ lib/net461/System.Configuration.ConfigurationManager.dll
+
+
+ CP0002
+ M:System.Configuration.Internal.DelegatingConfigHost.get_IsAppConfigHttp
lib/netstandard2.0/System.Configuration.ConfigurationManager.dll
lib/net461/System.Configuration.ConfigurationManager.dll
diff --git a/src/libraries/System.Configuration.ConfigurationManager/src/System.Configuration.ConfigurationManager.csproj b/src/libraries/System.Configuration.ConfigurationManager/src/System.Configuration.ConfigurationManager.csproj
index 302b9688391665..92cadbe1711a78 100644
--- a/src/libraries/System.Configuration.ConfigurationManager/src/System.Configuration.ConfigurationManager.csproj
+++ b/src/libraries/System.Configuration.ConfigurationManager/src/System.Configuration.ConfigurationManager.csproj
@@ -1,6 +1,6 @@
- $(NetCoreAppCurrent);netstandard2.0;net461
+ $(NetCoreAppCurrent);netstandard2.0;net461-windows
false
$(NoWarn);CA1847
diff --git a/src/libraries/System.Configuration.ConfigurationManager/tests/System.Configuration.ConfigurationManager.Tests.csproj b/src/libraries/System.Configuration.ConfigurationManager/tests/System.Configuration.ConfigurationManager.Tests.csproj
index 975159597c1bb9..4c5895f0a26c90 100644
--- a/src/libraries/System.Configuration.ConfigurationManager/tests/System.Configuration.ConfigurationManager.Tests.csproj
+++ b/src/libraries/System.Configuration.ConfigurationManager/tests/System.Configuration.ConfigurationManager.Tests.csproj
@@ -1,7 +1,7 @@
true
- $(NetCoreAppCurrent);net461
+ $(NetCoreAppCurrent);net461-windows
true
diff --git a/src/libraries/System.Console/src/System.Console.csproj b/src/libraries/System.Console/src/System.Console.csproj
index c464007dc95e95..6cbdc48890bb04 100644
--- a/src/libraries/System.Console/src/System.Console.csproj
+++ b/src/libraries/System.Console/src/System.Console.csproj
@@ -13,6 +13,7 @@
+
buffer) => throw Error.GetReadNotSupported();
-
- public override unsafe void Write(ReadOnlySpan buffer)
+ protected override void Print(ReadOnlySpan line)
{
- string log = ConsolePal.OutputEncoding.GetString(buffer);
+ string log = line.ToString();
Interop.Logcat.AndroidLogPrint(Interop.Logcat.LogLevel.Info, "DOTNET", log);
}
}
@@ -26,9 +24,9 @@ internal static void EnsureConsoleInitialized() { }
public static Stream OpenStandardInput() => throw new PlatformNotSupportedException();
- public static Stream OpenStandardOutput() => new LogcatStream();
+ public static Stream OpenStandardOutput() => new LogcatStream(OutputEncoding);
- public static Stream OpenStandardError() => new LogcatStream();
+ public static Stream OpenStandardError() => new LogcatStream(OutputEncoding);
public static Encoding InputEncoding => throw new PlatformNotSupportedException();
diff --git a/src/libraries/System.Console/src/System/ConsolePal.iOS.cs b/src/libraries/System.Console/src/System/ConsolePal.iOS.cs
index 5279df26401d04..8794d55aeff86d 100644
--- a/src/libraries/System.Console/src/System/ConsolePal.iOS.cs
+++ b/src/libraries/System.Console/src/System/ConsolePal.iOS.cs
@@ -1,22 +1,22 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
+using System.Buffers;
+using System.Diagnostics;
using System.IO;
using System.Text;
namespace System
{
- internal sealed class NSLogStream : ConsoleStream
+ internal sealed class NSLogStream : CachedConsoleStream
{
- public NSLogStream() : base(FileAccess.Write) {}
+ public NSLogStream(Encoding encoding) : base(encoding) {}
- public override int Read(Span buffer) => throw Error.GetReadNotSupported();
-
- public override unsafe void Write(ReadOnlySpan buffer)
+ protected override unsafe void Print(ReadOnlySpan line)
{
- fixed (byte* ptr = buffer)
+ fixed (char* ptr = line)
{
- Interop.Sys.Log(ptr, buffer.Length);
+ Interop.Sys.Log((byte*)ptr, line.Length * 2);
}
}
}
@@ -28,9 +28,9 @@ internal static void EnsureConsoleInitialized()
public static Stream OpenStandardInput() => throw new PlatformNotSupportedException();
- public static Stream OpenStandardOutput() => new NSLogStream();
+ public static Stream OpenStandardOutput() => new NSLogStream(OutputEncoding);
- public static Stream OpenStandardError() => new NSLogStream();
+ public static Stream OpenStandardError() => new NSLogStream(OutputEncoding);
public static Encoding InputEncoding => throw new PlatformNotSupportedException();
diff --git a/src/libraries/System.Console/src/System/IO/CachedConsoleStream.cs b/src/libraries/System.Console/src/System/IO/CachedConsoleStream.cs
new file mode 100644
index 00000000000000..6aacda65a082a3
--- /dev/null
+++ b/src/libraries/System.Console/src/System/IO/CachedConsoleStream.cs
@@ -0,0 +1,77 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Buffers;
+using System.Diagnostics;
+using System.IO;
+using System.Text;
+
+namespace System.IO
+{
+ internal abstract class CachedConsoleStream : ConsoleStream
+ {
+ private readonly StringBuilder _buffer = new StringBuilder();
+ private readonly Encoding _encoding;
+ private readonly Decoder _decoder;
+
+ public CachedConsoleStream(Encoding encoding) : base(FileAccess.Write)
+ {
+ _encoding = encoding;
+ _decoder = _encoding.GetDecoder();
+ }
+
+ public override int Read(Span buffer) => throw Error.GetReadNotSupported();
+
+ public override void Write(ReadOnlySpan buffer)
+ {
+ int maxCharCount = _encoding.GetMaxCharCount(buffer.Length);
+ char[]? pooledBuffer = null;
+ Span charSpan = maxCharCount <= 512 ? stackalloc char[512] : (pooledBuffer = ArrayPool.Shared.Rent(maxCharCount));
+ try
+ {
+ int count = _decoder.GetChars(buffer, charSpan, false);
+ if (count > 0)
+ {
+ WriteOrCache(this, _buffer, charSpan.Slice(0, count));
+ }
+ }
+ finally
+ {
+ if (pooledBuffer != null)
+ {
+ ArrayPool.Shared.Return(pooledBuffer);
+ }
+ }
+ }
+
+ protected abstract void Print(ReadOnlySpan line);
+
+ private static void WriteOrCache(CachedConsoleStream stream, StringBuilder cache, Span charBuffer)
+ {
+ int lastNewLine = charBuffer.LastIndexOf('\n');
+ if (lastNewLine != -1)
+ {
+ Span lineSpan = charBuffer.Slice(0, lastNewLine);
+ if (cache.Length > 0)
+ {
+ stream.Print(cache.Append(lineSpan).ToString());
+ cache.Clear();
+ }
+ else
+ {
+ stream.Print(lineSpan);
+ }
+
+ if (lastNewLine + 1 < charBuffer.Length)
+ {
+ cache.Append(charBuffer.Slice(lastNewLine + 1));
+ }
+
+ return;
+ }
+
+ // no newlines found, add the entire buffer to the cache
+ cache.Append(charBuffer);
+ }
+ }
+}
diff --git a/src/libraries/System.Console/tests/ReadAndWrite.cs b/src/libraries/System.Console/tests/ReadAndWrite.cs
index 6fd77d6afa9918..c671e4f90313f0 100644
--- a/src/libraries/System.Console/tests/ReadAndWrite.cs
+++ b/src/libraries/System.Console/tests/ReadAndWrite.cs
@@ -194,6 +194,25 @@ public static async Task OutWriteAndWriteLineOverloads()
}
}
+ [Fact]
+ [PlatformSpecific(TestPlatforms.iOS | TestPlatforms.MacCatalyst | TestPlatforms.tvOS)]
+ public void TestConsoleWrite()
+ {
+ Stream s = new MemoryStream();
+ TextWriter w = new StreamWriter(s);
+ ((StreamWriter)w).AutoFlush = true;
+ TextReader r = new StreamReader(s);
+ Console.SetOut(w);
+
+ Console.Write("A");
+ Console.Write("B");
+ Console.Write("C");
+
+ s.Position = 0;
+ string line = r.ReadToEnd();
+ Assert.Equal("ABC", line);
+ }
+
private static unsafe void ValidateConsoleEncoding(Encoding encoding)
{
Assert.NotNull(encoding);
diff --git a/src/libraries/System.Data.Odbc/src/CompatibilitySuppressions.xml b/src/libraries/System.Data.Odbc/src/CompatibilitySuppressions.xml
index 627b6d1f8addb7..e20e47d1100c30 100644
--- a/src/libraries/System.Data.Odbc/src/CompatibilitySuppressions.xml
+++ b/src/libraries/System.Data.Odbc/src/CompatibilitySuppressions.xml
@@ -1,9 +1,16 @@
- CP0001
- lib/netstandard2.0/System.Data.Odbc.dll
- lib/net461/System.Data.Odbc.dll
+ CP0002
+ M:System.Data.Odbc.OdbcParameter.get_Offset
+ lib/net6.0/System.Data.Odbc.dll
+ runtimes/win/lib/net6.0/System.Data.Odbc.dll
+
+
+ CP0002
+ M:System.Data.Odbc.OdbcParameter.set_Offset(System.Int32)
+ lib/net6.0/System.Data.Odbc.dll
+ runtimes/win/lib/net6.0/System.Data.Odbc.dll
CP0002
@@ -92,14 +99,14 @@
CP0002
M:System.Data.Odbc.OdbcParameter.get_Offset
- lib/net6.0/System.Data.Odbc.dll
- runtimes/win/lib/net6.0/System.Data.Odbc.dll
+ lib/netcoreapp3.1/System.Data.Odbc.dll
+ runtimes/win/lib/netcoreapp3.1/System.Data.Odbc.dll
CP0002
M:System.Data.Odbc.OdbcParameter.set_Offset(System.Int32)
- lib/net6.0/System.Data.Odbc.dll
- runtimes/win/lib/net6.0/System.Data.Odbc.dll
+ lib/netcoreapp3.1/System.Data.Odbc.dll
+ runtimes/win/lib/netcoreapp3.1/System.Data.Odbc.dll
CP0002
@@ -140,97 +147,169 @@
CP0002
M:System.Data.Odbc.OdbcParameter.get_Offset
- lib/netcoreapp3.1/System.Data.Odbc.dll
- runtimes/win/lib/netcoreapp3.1/System.Data.Odbc.dll
+ runtimes/freebsd/lib/net6.0/System.Data.Odbc.dll
+ lib/net6.0/System.Data.Odbc.dll
+ true
CP0002
M:System.Data.Odbc.OdbcParameter.set_Offset(System.Int32)
- lib/netcoreapp3.1/System.Data.Odbc.dll
- runtimes/win/lib/netcoreapp3.1/System.Data.Odbc.dll
+ runtimes/freebsd/lib/net6.0/System.Data.Odbc.dll
+ lib/net6.0/System.Data.Odbc.dll
+ true
+
+
+ CP0002
+ M:System.Data.Odbc.OdbcParameter.get_Offset
+ runtimes/illumos/lib/net6.0/System.Data.Odbc.dll
+ lib/net6.0/System.Data.Odbc.dll
+ true
+
+
+ CP0002
+ M:System.Data.Odbc.OdbcParameter.set_Offset(System.Int32)
+ runtimes/illumos/lib/net6.0/System.Data.Odbc.dll
+ lib/net6.0/System.Data.Odbc.dll
+ true
+
+
+ CP0002
+ M:System.Data.Odbc.OdbcParameter.get_Offset
+ runtimes/ios/lib/net6.0/System.Data.Odbc.dll
+ lib/net6.0/System.Data.Odbc.dll
+ true
+
+
+ CP0002
+ M:System.Data.Odbc.OdbcParameter.set_Offset(System.Int32)
+ runtimes/ios/lib/net6.0/System.Data.Odbc.dll
+ lib/net6.0/System.Data.Odbc.dll
+ true
- CP0001
- T:System.Data.Odbc.ODBC32
- runtimes/freebsd/lib/netcoreapp2.0/System.Data.Odbc.dll
- lib/netstandard2.0/System.Data.Odbc.dll
+ CP0002
+ M:System.Data.Odbc.OdbcParameter.get_Offset
+ runtimes/linux/lib/net6.0/System.Data.Odbc.dll
+ lib/net6.0/System.Data.Odbc.dll
+ true
+
+
+ CP0002
+ M:System.Data.Odbc.OdbcParameter.set_Offset(System.Int32)
+ runtimes/linux/lib/net6.0/System.Data.Odbc.dll
+ lib/net6.0/System.Data.Odbc.dll
true
CP0002
M:System.Data.Odbc.OdbcParameter.get_Offset
- runtimes/freebsd/lib/netcoreapp2.0/System.Data.Odbc.dll
- lib/netstandard2.0/System.Data.Odbc.dll
+ runtimes/osx/lib/net6.0/System.Data.Odbc.dll
+ lib/net6.0/System.Data.Odbc.dll
true
CP0002
M:System.Data.Odbc.OdbcParameter.set_Offset(System.Int32)
- runtimes/freebsd/lib/netcoreapp2.0/System.Data.Odbc.dll
- lib/netstandard2.0/System.Data.Odbc.dll
+ runtimes/osx/lib/net6.0/System.Data.Odbc.dll
+ lib/net6.0/System.Data.Odbc.dll
true
- CP0001
- T:System.Data.Odbc.ODBC32
- runtimes/linux/lib/netcoreapp2.0/System.Data.Odbc.dll
- lib/netstandard2.0/System.Data.Odbc.dll
+ CP0002
+ M:System.Data.Odbc.OdbcParameter.get_Offset
+ runtimes/solaris/lib/net6.0/System.Data.Odbc.dll
+ lib/net6.0/System.Data.Odbc.dll
+ true
+
+
+ CP0002
+ M:System.Data.Odbc.OdbcParameter.set_Offset(System.Int32)
+ runtimes/solaris/lib/net6.0/System.Data.Odbc.dll
+ lib/net6.0/System.Data.Odbc.dll
true
CP0002
M:System.Data.Odbc.OdbcParameter.get_Offset
- runtimes/linux/lib/netcoreapp2.0/System.Data.Odbc.dll
- lib/netstandard2.0/System.Data.Odbc.dll
+ runtimes/tvos/lib/net6.0/System.Data.Odbc.dll
+ lib/net6.0/System.Data.Odbc.dll
true
CP0002
M:System.Data.Odbc.OdbcParameter.set_Offset(System.Int32)
- runtimes/linux/lib/netcoreapp2.0/System.Data.Odbc.dll
- lib/netstandard2.0/System.Data.Odbc.dll
+ runtimes/tvos/lib/net6.0/System.Data.Odbc.dll
+ lib/net6.0/System.Data.Odbc.dll
true
- CP0001
- T:System.Data.Odbc.ODBC32
- runtimes/osx/lib/netcoreapp2.0/System.Data.Odbc.dll
- lib/netstandard2.0/System.Data.Odbc.dll
+ CP0002
+ M:System.Data.Odbc.OdbcParameter.get_Offset
+ runtimes/win/lib/net6.0/System.Data.Odbc.dll
+ lib/net6.0/System.Data.Odbc.dll
+ true
+
+
+ CP0002
+ M:System.Data.Odbc.OdbcParameter.set_Offset(System.Int32)
+ runtimes/win/lib/net6.0/System.Data.Odbc.dll
+ lib/net6.0/System.Data.Odbc.dll
+ true
+
+
+ CP0002
+ M:System.Data.Odbc.OdbcParameter.get_Offset
+ runtimes/freebsd/lib/netcoreapp3.1/System.Data.Odbc.dll
+ lib/netcoreapp3.1/System.Data.Odbc.dll
+ true
+
+
+ CP0002
+ M:System.Data.Odbc.OdbcParameter.set_Offset(System.Int32)
+ runtimes/freebsd/lib/netcoreapp3.1/System.Data.Odbc.dll
+ lib/netcoreapp3.1/System.Data.Odbc.dll
true
CP0002
M:System.Data.Odbc.OdbcParameter.get_Offset
- runtimes/osx/lib/netcoreapp2.0/System.Data.Odbc.dll
- lib/netstandard2.0/System.Data.Odbc.dll
+ runtimes/linux/lib/netcoreapp3.1/System.Data.Odbc.dll
+ lib/netcoreapp3.1/System.Data.Odbc.dll
true
CP0002
M:System.Data.Odbc.OdbcParameter.set_Offset(System.Int32)
- runtimes/osx/lib/netcoreapp2.0/System.Data.Odbc.dll
- lib/netstandard2.0/System.Data.Odbc.dll
+ runtimes/linux/lib/netcoreapp3.1/System.Data.Odbc.dll
+ lib/netcoreapp3.1/System.Data.Odbc.dll
+ true
+
+
+ CP0002
+ M:System.Data.Odbc.OdbcParameter.get_Offset
+ runtimes/osx/lib/netcoreapp3.1/System.Data.Odbc.dll
+ lib/netcoreapp3.1/System.Data.Odbc.dll
true
- CP0001
- T:System.Data.Odbc.ODBC32
- runtimes/win/lib/netcoreapp2.0/System.Data.Odbc.dll
- lib/netstandard2.0/System.Data.Odbc.dll
+ CP0002
+ M:System.Data.Odbc.OdbcParameter.set_Offset(System.Int32)
+ runtimes/osx/lib/netcoreapp3.1/System.Data.Odbc.dll
+ lib/netcoreapp3.1/System.Data.Odbc.dll
true
CP0002
M:System.Data.Odbc.OdbcParameter.get_Offset
- runtimes/win/lib/netcoreapp2.0/System.Data.Odbc.dll
- lib/netstandard2.0/System.Data.Odbc.dll
+ runtimes/win/lib/netcoreapp3.1/System.Data.Odbc.dll
+ lib/netcoreapp3.1/System.Data.Odbc.dll
true
CP0002
M:System.Data.Odbc.OdbcParameter.set_Offset(System.Int32)
- runtimes/win/lib/netcoreapp2.0/System.Data.Odbc.dll
- lib/netstandard2.0/System.Data.Odbc.dll
+ runtimes/win/lib/netcoreapp3.1/System.Data.Odbc.dll
+ lib/netcoreapp3.1/System.Data.Odbc.dll
true
\ No newline at end of file
diff --git a/src/libraries/System.Data.Odbc/src/System.Data.Odbc.csproj b/src/libraries/System.Data.Odbc/src/System.Data.Odbc.csproj
index 628b8d1e9e0452..eff55039c3e9f4 100644
--- a/src/libraries/System.Data.Odbc/src/System.Data.Odbc.csproj
+++ b/src/libraries/System.Data.Odbc/src/System.Data.Odbc.csproj
@@ -1,7 +1,7 @@
true
- $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-FreeBSD;$(NetCoreAppCurrent)-illumos;$(NetCoreAppCurrent)-Solaris;$(NetCoreAppCurrent)-Linux;$(NetCoreAppCurrent)-OSX;$(NetCoreAppCurrent)-iOS;$(NetCoreAppCurrent)-tvOS;$(NetCoreAppCurrent);netcoreapp3.1-windows;netcoreapp3.1-FreeBSD;netcoreapp3.1-Linux;netcoreapp3.1-OSX;netcoreapp3.1;netstandard2.0;net461
+ $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-FreeBSD;$(NetCoreAppCurrent)-illumos;$(NetCoreAppCurrent)-Solaris;$(NetCoreAppCurrent)-Linux;$(NetCoreAppCurrent)-OSX;$(NetCoreAppCurrent)-iOS;$(NetCoreAppCurrent)-tvOS;$(NetCoreAppCurrent);netcoreapp3.1-windows;netcoreapp3.1-FreeBSD;netcoreapp3.1-Linux;netcoreapp3.1-OSX;netcoreapp3.1;netstandard2.0;net461-windows
$(NoWarn);CA2249;CA1838
enable
true
diff --git a/src/libraries/System.Data.OleDb/ref/System.Data.OleDb.csproj b/src/libraries/System.Data.OleDb/ref/System.Data.OleDb.csproj
index 4cc65fb4368cf9..370bfcc6896694 100644
--- a/src/libraries/System.Data.OleDb/ref/System.Data.OleDb.csproj
+++ b/src/libraries/System.Data.OleDb/ref/System.Data.OleDb.csproj
@@ -23,7 +23,6 @@
-
diff --git a/src/libraries/System.Data.OleDb/src/CompatibilitySuppressions.xml b/src/libraries/System.Data.OleDb/src/CompatibilitySuppressions.xml
deleted file mode 100644
index 3bdc38c1743f04..00000000000000
--- a/src/libraries/System.Data.OleDb/src/CompatibilitySuppressions.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
- CP0001
- lib/netstandard2.0/System.Data.OleDb.dll
- lib/net461/System.Data.OleDb.dll
-
-
\ No newline at end of file
diff --git a/src/libraries/System.Data.OleDb/src/System.Data.OleDb.csproj b/src/libraries/System.Data.OleDb/src/System.Data.OleDb.csproj
index a5e9b248302241..94d1b0e1b88bbc 100644
--- a/src/libraries/System.Data.OleDb/src/System.Data.OleDb.csproj
+++ b/src/libraries/System.Data.OleDb/src/System.Data.OleDb.csproj
@@ -152,8 +152,6 @@ System.Data.OleDb.OleDbTransaction
-
-
diff --git a/src/libraries/System.Diagnostics.DiagnosticSource/src/System/Diagnostics/DiagnosticSourceEventSource.cs b/src/libraries/System.Diagnostics.DiagnosticSource/src/System/Diagnostics/DiagnosticSourceEventSource.cs
index c7b92ad12ff2de..b598a75fa85e81 100644
--- a/src/libraries/System.Diagnostics.DiagnosticSource/src/System/Diagnostics/DiagnosticSourceEventSource.cs
+++ b/src/libraries/System.Diagnostics.DiagnosticSource/src/System/Diagnostics/DiagnosticSourceEventSource.cs
@@ -1345,7 +1345,19 @@ public static PropertyFetch FetcherForProperty(Type? type, string propertyName)
}
else
{
- PropertyInfo? propertyInfo = typeInfo.GetProperty(propertyName, BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.Static);
+ PropertyInfo? propertyInfo = typeInfo.GetDeclaredProperty(propertyName);
+ if (propertyInfo == null)
+ {
+ foreach (PropertyInfo pi in typeInfo.GetProperties(BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.Static))
+ {
+ if (pi.Name == propertyName)
+ {
+ propertyInfo = pi;
+ break;
+ }
+ }
+ }
+
if (propertyInfo == null)
{
Log.Message($"Property {propertyName} not found on {type}. Ensure the name is spelled correctly. If you published the application with PublishTrimmed=true, ensure the property was not trimmed away.");
diff --git a/src/libraries/System.Diagnostics.DiagnosticSource/tests/DiagnosticSourceEventSourceBridgeTests.cs b/src/libraries/System.Diagnostics.DiagnosticSource/tests/DiagnosticSourceEventSourceBridgeTests.cs
index c6f16f634022c5..b3fb43640498b9 100644
--- a/src/libraries/System.Diagnostics.DiagnosticSource/tests/DiagnosticSourceEventSourceBridgeTests.cs
+++ b/src/libraries/System.Diagnostics.DiagnosticSource/tests/DiagnosticSourceEventSourceBridgeTests.cs
@@ -524,6 +524,39 @@ public void TestBaseClassProperties()
}).Dispose();
}
+ ///
+ /// Tests that DiagnosticSourceEventSource can read property values from base classes
+ ///
+ [ConditionalFact(typeof(RemoteExecutor), nameof(RemoteExecutor.IsSupported))]
+ public void TestBaseClassDuplicateProperties()
+ {
+ RemoteExecutor.Invoke(() =>
+ {
+ using (var eventSourceListener = new TestDiagnosticSourceEventListener())
+ using (var diagnosticSourceListener = new DiagnosticListener("TestBaseClassProperties"))
+ {
+ Assert.Equal(0, eventSourceListener.EventCount);
+ eventSourceListener.Enable(
+ " TestBaseClassProperties/TestEvent1:Point_X=Point.X;Point_Y=Point.Y;Url=Url\r\n");
+
+ /***************************************************************************************/
+ // Emit an event that matches the first pattern.
+ MyClass val = new MyOtherDerivedClass() { Url = "MyUrl", Point = new MyDerivedPoint() { X = 3, Y = 5 } };
+ if (diagnosticSourceListener.IsEnabled("TestEvent1"))
+ diagnosticSourceListener.Write("TestEvent1", val);
+
+ Assert.Equal(1, eventSourceListener.EventCount); // Exactly one more event has been emitted.
+ Assert.Equal("TestBaseClassProperties", eventSourceListener.LastEvent.SourceName);
+ Assert.Equal("TestEvent1", eventSourceListener.LastEvent.EventName);
+ Assert.Equal(4, eventSourceListener.LastEvent.Arguments.Count);
+ Assert.Equal("3", eventSourceListener.LastEvent.Arguments["Point_X"]);
+ Assert.Equal("5", eventSourceListener.LastEvent.Arguments["Point_Y"]);
+ Assert.Equal("MyUrl", eventSourceListener.LastEvent.Arguments["Url"]);
+ eventSourceListener.ResetEventCountAndLastEvent();
+ }
+ }).Dispose();
+ }
+
///
/// Test that things work properly for Linux newline conventions.
///
@@ -1353,6 +1386,11 @@ internal class MyDerivedClass : MyClass
public string AnotherString { get; set; }
}
+ internal class MyOtherDerivedClass : MyClass
+ {
+ public new MyDerivedPoint Point { get; set; }
+ }
+
///
/// classes for test data.
///
@@ -1362,6 +1400,9 @@ internal class MyPoint
public int Y { get; set; }
}
+ internal class MyDerivedPoint : MyPoint
+ { }
+
///
/// classes for test data
///
diff --git a/src/libraries/System.Diagnostics.EventLog/src/CompatibilitySuppressions.xml b/src/libraries/System.Diagnostics.EventLog/src/CompatibilitySuppressions.xml
deleted file mode 100644
index 751a9e77e891e3..00000000000000
--- a/src/libraries/System.Diagnostics.EventLog/src/CompatibilitySuppressions.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
- CP0001
- lib/netstandard2.0/System.Diagnostics.EventLog.dll
- lib/net461/System.Diagnostics.EventLog.dll
-
-
\ No newline at end of file
diff --git a/src/libraries/System.Diagnostics.EventLog/tests/System/Diagnostics/Reader/EventLogRecordTests.cs b/src/libraries/System.Diagnostics.EventLog/tests/System/Diagnostics/Reader/EventLogRecordTests.cs
index 6d4f252bdefb47..7808662bcb0201 100644
--- a/src/libraries/System.Diagnostics.EventLog/tests/System/Diagnostics/Reader/EventLogRecordTests.cs
+++ b/src/libraries/System.Diagnostics.EventLog/tests/System/Diagnostics/Reader/EventLogRecordTests.cs
@@ -90,7 +90,8 @@ public void ToXml()
[ConditionalFact(typeof(Helpers), nameof(Helpers.SupportsEventLogs))]
public void ExceptionOnce()
{
- if (PlatformDetection.IsWindows7) // Null events in PowerShell log
+ if (PlatformDetection.IsWindows7 || // Null events in PowerShell log
+ PlatformDetection.IsWindows10Version22000OrGreater) // ActiveIssue("https://github.com/dotnet/runtime/issues/58829")
return;
var query = new EventLogQuery("Application", PathType.LogName, "*[System]") { ReverseDirection = true };
var eventLog = new EventLogReader(query, Helpers.GetBookmark("Application", PathType.LogName));
diff --git a/src/libraries/System.Diagnostics.EventLog/tests/System/Diagnostics/Reader/ProviderMetadataTests.cs b/src/libraries/System.Diagnostics.EventLog/tests/System/Diagnostics/Reader/ProviderMetadataTests.cs
index 0f7f4511022d65..1a47f63af4322f 100644
--- a/src/libraries/System.Diagnostics.EventLog/tests/System/Diagnostics/Reader/ProviderMetadataTests.cs
+++ b/src/libraries/System.Diagnostics.EventLog/tests/System/Diagnostics/Reader/ProviderMetadataTests.cs
@@ -23,6 +23,9 @@ public void SourceDoesNotExist_Throws()
[InlineData(false)]
public void ProviderNameTests(bool noProviderName)
{
+ if (PlatformDetection.IsWindows10Version22000OrGreater) // ActiveIssue("https://github.com/dotnet/runtime/issues/58829")
+ return;
+
string log = "Application";
string source = "Source_" + nameof(ProviderNameTests);
using (var session = new EventLogSession())
diff --git a/src/libraries/System.Diagnostics.PerformanceCounter/src/CompatibilitySuppressions.xml b/src/libraries/System.Diagnostics.PerformanceCounter/src/CompatibilitySuppressions.xml
deleted file mode 100644
index 5dd8d50f606e67..00000000000000
--- a/src/libraries/System.Diagnostics.PerformanceCounter/src/CompatibilitySuppressions.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
- CP0001
- lib/netstandard2.0/System.Diagnostics.PerformanceCounter.dll
- lib/net461/System.Diagnostics.PerformanceCounter.dll
-
-
\ No newline at end of file
diff --git a/src/libraries/System.Diagnostics.Process/ref/System.Diagnostics.Process.cs b/src/libraries/System.Diagnostics.Process/ref/System.Diagnostics.Process.cs
index 4c98a461f323e7..7e1f6d5d77adec 100644
--- a/src/libraries/System.Diagnostics.Process/ref/System.Diagnostics.Process.cs
+++ b/src/libraries/System.Diagnostics.Process/ref/System.Diagnostics.Process.cs
@@ -43,8 +43,8 @@ public Process() { }
public System.Diagnostics.ProcessModule? MainModule { get { throw null; } }
public System.IntPtr MainWindowHandle { get { throw null; } }
public string MainWindowTitle { get { throw null; } }
- public System.IntPtr MaxWorkingSet { [System.Runtime.Versioning.UnsupportedOSPlatformAttribute("ios"), System.Runtime.Versioning.UnsupportedOSPlatformAttribute("tvos")] get { throw null; } [System.Runtime.Versioning.SupportedOSPlatformAttribute("freebsd"), System.Runtime.Versioning.SupportedOSPlatformAttribute("macos"), System.Runtime.Versioning.SupportedOSPlatformAttribute("windows")] set { } }
- public System.IntPtr MinWorkingSet { [System.Runtime.Versioning.UnsupportedOSPlatformAttribute("ios"), System.Runtime.Versioning.UnsupportedOSPlatformAttribute("tvos")] get { throw null; } [System.Runtime.Versioning.SupportedOSPlatformAttribute("freebsd"), System.Runtime.Versioning.SupportedOSPlatformAttribute("macos"), System.Runtime.Versioning.SupportedOSPlatformAttribute("windows")] set { } }
+ public System.IntPtr MaxWorkingSet { [System.Runtime.Versioning.UnsupportedOSPlatformAttribute("ios"), System.Runtime.Versioning.UnsupportedOSPlatformAttribute("tvos"), System.Runtime.Versioning.SupportedOSPlatformAttribute("maccatalyst")] get { throw null; } [System.Runtime.Versioning.SupportedOSPlatformAttribute("freebsd"), System.Runtime.Versioning.SupportedOSPlatformAttribute("macos"), System.Runtime.Versioning.SupportedOSPlatformAttribute("maccatalyst"), System.Runtime.Versioning.SupportedOSPlatformAttribute("windows")] set { } }
+ public System.IntPtr MinWorkingSet { [System.Runtime.Versioning.UnsupportedOSPlatformAttribute("ios"), System.Runtime.Versioning.UnsupportedOSPlatformAttribute("tvos"), System.Runtime.Versioning.SupportedOSPlatformAttribute("maccatalyst")] get { throw null; } [System.Runtime.Versioning.SupportedOSPlatformAttribute("freebsd"), System.Runtime.Versioning.SupportedOSPlatformAttribute("macos"), System.Runtime.Versioning.SupportedOSPlatformAttribute("maccatalyst"), System.Runtime.Versioning.SupportedOSPlatformAttribute("windows")] set { } }
public System.Diagnostics.ProcessModuleCollection Modules { get { throw null; } }
[System.ObsoleteAttribute("Process.NonpagedSystemMemorySize has been deprecated because the type of the property can't represent all valid results. Use System.Diagnostics.Process.NonpagedSystemMemorySize64 instead.")]
public int NonpagedSystemMemorySize { get { throw null; } }
@@ -84,7 +84,13 @@ public Process() { }
public System.DateTime StartTime { get { throw null; } }
public System.ComponentModel.ISynchronizeInvoke? SynchronizingObject { get { throw null; } set { } }
public System.Diagnostics.ProcessThreadCollection Threads { get { throw null; } }
+ [System.Runtime.Versioning.UnsupportedOSPlatformAttribute("ios")]
+ [System.Runtime.Versioning.UnsupportedOSPlatformAttribute("tvos")]
+ [System.Runtime.Versioning.SupportedOSPlatformAttribute("maccatalyst")]
public System.TimeSpan TotalProcessorTime { get { throw null; } }
+ [System.Runtime.Versioning.UnsupportedOSPlatformAttribute("ios")]
+ [System.Runtime.Versioning.UnsupportedOSPlatformAttribute("tvos")]
+ [System.Runtime.Versioning.SupportedOSPlatformAttribute("maccatalyst")]
public System.TimeSpan UserProcessorTime { get { throw null; } }
[System.ObsoleteAttribute("Process.VirtualMemorySize has been deprecated because the type of the property can't represent all valid results. Use System.Diagnostics.Process.VirtualMemorySize64 instead.")]
public int VirtualMemorySize { get { throw null; } }
@@ -106,33 +112,52 @@ public static void EnterDebugMode() { }
public static System.Diagnostics.Process GetCurrentProcess() { throw null; }
public static System.Diagnostics.Process GetProcessById(int processId) { throw null; }
public static System.Diagnostics.Process GetProcessById(int processId, string machineName) { throw null; }
+ [System.Runtime.Versioning.UnsupportedOSPlatformAttribute("ios")]
+ [System.Runtime.Versioning.UnsupportedOSPlatformAttribute("tvos")]
+ [System.Runtime.Versioning.SupportedOSPlatformAttribute("maccatalyst")]
public static System.Diagnostics.Process[] GetProcesses() { throw null; }
+ [System.Runtime.Versioning.UnsupportedOSPlatformAttribute("ios")]
+ [System.Runtime.Versioning.UnsupportedOSPlatformAttribute("tvos")]
+ [System.Runtime.Versioning.SupportedOSPlatformAttribute("maccatalyst")]
public static System.Diagnostics.Process[] GetProcesses(string machineName) { throw null; }
+ [System.Runtime.Versioning.UnsupportedOSPlatformAttribute("ios")]
+ [System.Runtime.Versioning.UnsupportedOSPlatformAttribute("tvos")]
+ [System.Runtime.Versioning.SupportedOSPlatformAttribute("maccatalyst")]
public static System.Diagnostics.Process[] GetProcessesByName(string? processName) { throw null; }
+ [System.Runtime.Versioning.UnsupportedOSPlatformAttribute("ios")]
+ [System.Runtime.Versioning.UnsupportedOSPlatformAttribute("tvos")]
+ [System.Runtime.Versioning.SupportedOSPlatformAttribute("maccatalyst")]
public static System.Diagnostics.Process[] GetProcessesByName(string? processName, string machineName) { throw null; }
[System.Runtime.Versioning.UnsupportedOSPlatformAttribute("ios")]
[System.Runtime.Versioning.UnsupportedOSPlatformAttribute("tvos")]
+ [System.Runtime.Versioning.SupportedOSPlatformAttribute("maccatalyst")]
public void Kill() { }
[System.Runtime.Versioning.UnsupportedOSPlatformAttribute("ios")]
[System.Runtime.Versioning.UnsupportedOSPlatformAttribute("tvos")]
+ [System.Runtime.Versioning.SupportedOSPlatformAttribute("maccatalyst")]
public void Kill(bool entireProcessTree) { }
public static void LeaveDebugMode() { }
protected void OnExited() { }
public void Refresh() { }
[System.Runtime.Versioning.UnsupportedOSPlatformAttribute("ios")]
[System.Runtime.Versioning.UnsupportedOSPlatformAttribute("tvos")]
+ [System.Runtime.Versioning.SupportedOSPlatformAttribute("maccatalyst")]
public bool Start() { throw null; }
[System.Runtime.Versioning.UnsupportedOSPlatformAttribute("ios")]
[System.Runtime.Versioning.UnsupportedOSPlatformAttribute("tvos")]
+ [System.Runtime.Versioning.SupportedOSPlatformAttribute("maccatalyst")]
public static System.Diagnostics.Process? Start(System.Diagnostics.ProcessStartInfo startInfo) { throw null; }
[System.Runtime.Versioning.UnsupportedOSPlatformAttribute("ios")]
[System.Runtime.Versioning.UnsupportedOSPlatformAttribute("tvos")]
+ [System.Runtime.Versioning.SupportedOSPlatformAttribute("maccatalyst")]
public static System.Diagnostics.Process Start(string fileName) { throw null; }
[System.Runtime.Versioning.UnsupportedOSPlatformAttribute("ios")]
[System.Runtime.Versioning.UnsupportedOSPlatformAttribute("tvos")]
+ [System.Runtime.Versioning.SupportedOSPlatformAttribute("maccatalyst")]
public static System.Diagnostics.Process Start(string fileName, string arguments) { throw null; }
[System.Runtime.Versioning.UnsupportedOSPlatformAttribute("ios")]
[System.Runtime.Versioning.UnsupportedOSPlatformAttribute("tvos")]
+ [System.Runtime.Versioning.SupportedOSPlatformAttribute("maccatalyst")]
public static System.Diagnostics.Process Start(string fileName, System.Collections.Generic.IEnumerable arguments) { throw null; }
[System.CLSCompliantAttribute(false)]
[System.Runtime.Versioning.SupportedOSPlatformAttribute("windows")]
@@ -233,6 +258,9 @@ internal ProcessThread() { }
public int IdealProcessor { set { } }
public bool PriorityBoostEnabled { get { throw null; } set { } }
public System.Diagnostics.ThreadPriorityLevel PriorityLevel { [System.Runtime.Versioning.SupportedOSPlatform("windows")] [System.Runtime.Versioning.SupportedOSPlatform("linux")] [System.Runtime.Versioning.SupportedOSPlatform("freebsd")] get { throw null; } [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows")] set { } }
+ [System.Runtime.Versioning.UnsupportedOSPlatformAttribute("ios")]
+ [System.Runtime.Versioning.UnsupportedOSPlatformAttribute("tvos")]
+ [System.Runtime.Versioning.SupportedOSPlatformAttribute("maccatalyst")]
public System.TimeSpan PrivilegedProcessorTime { get { throw null; } }
[System.Runtime.Versioning.SupportedOSPlatformAttribute("windows")]
public System.IntPtr ProcessorAffinity { set { } }
@@ -241,7 +269,13 @@ public System.IntPtr ProcessorAffinity { set { } }
[System.Runtime.Versioning.SupportedOSPlatform("linux")]
public System.DateTime StartTime { get { throw null; } }
public System.Diagnostics.ThreadState ThreadState { get { throw null; } }
+ [System.Runtime.Versioning.UnsupportedOSPlatformAttribute("ios")]
+ [System.Runtime.Versioning.UnsupportedOSPlatformAttribute("tvos")]
+ [System.Runtime.Versioning.SupportedOSPlatformAttribute("maccatalyst")]
public System.TimeSpan TotalProcessorTime { get { throw null; } }
+ [System.Runtime.Versioning.UnsupportedOSPlatformAttribute("ios")]
+ [System.Runtime.Versioning.UnsupportedOSPlatformAttribute("tvos")]
+ [System.Runtime.Versioning.SupportedOSPlatformAttribute("maccatalyst")]
public System.TimeSpan UserProcessorTime { get { throw null; } }
public System.Diagnostics.ThreadWaitReason WaitReason { get { throw null; } }
public void ResetIdealProcessor() { }
diff --git a/src/libraries/System.Diagnostics.Process/src/System.Diagnostics.Process.csproj b/src/libraries/System.Diagnostics.Process/src/System.Diagnostics.Process.csproj
index 1bf0c43270e42e..64de4a154066de 100644
--- a/src/libraries/System.Diagnostics.Process/src/System.Diagnostics.Process.csproj
+++ b/src/libraries/System.Diagnostics.Process/src/System.Diagnostics.Process.csproj
@@ -2,7 +2,7 @@
$(DefineConstants);FEATURE_REGISTRY
true
- $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-FreeBSD;$(NetCoreAppCurrent)-Linux;$(NetCoreAppCurrent);$(NetCoreAppCurrent)-OSX;$(NetCoreAppCurrent)-iOS;$(NetCoreAppCurrent)-tvOS
+ $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-FreeBSD;$(NetCoreAppCurrent)-Linux;$(NetCoreAppCurrent);$(NetCoreAppCurrent)-OSX;$(NetCoreAppCurrent)-MacCatalyst;$(NetCoreAppCurrent)-iOS;$(NetCoreAppCurrent)-tvOS
enable
$(NoWarn);0649
@@ -309,7 +309,7 @@
-
+
@@ -329,7 +329,7 @@
-
+
@@ -345,6 +345,11 @@
+
+
+
+
+
diff --git a/src/libraries/System.Diagnostics.Process/src/System/Diagnostics/Process.BSD.cs b/src/libraries/System.Diagnostics.Process/src/System/Diagnostics/Process.BSD.cs
index 02b7cce02263d6..70c408cea290bb 100644
--- a/src/libraries/System.Diagnostics.Process/src/System/Diagnostics/Process.BSD.cs
+++ b/src/libraries/System.Diagnostics.Process/src/System/Diagnostics/Process.BSD.cs
@@ -3,6 +3,7 @@
using System.Collections.Generic;
using System.ComponentModel;
+using System.Runtime.Versioning;
namespace System.Diagnostics
{
@@ -12,6 +13,9 @@ public partial class Process
/// Creates an array of components that are associated with process resources on a
/// remote computer. These process resources share the specified process name.
///
+ [UnsupportedOSPlatform("ios")]
+ [UnsupportedOSPlatform("tvos")]
+ [SupportedOSPlatform("maccatalyst")]
public static Process[] GetProcessesByName(string? processName, string machineName)
{
if (processName == null)
diff --git a/src/libraries/System.Diagnostics.Process/src/System/Diagnostics/Process.Linux.cs b/src/libraries/System.Diagnostics.Process/src/System/Diagnostics/Process.Linux.cs
index 6942d82d6d1595..e4b149b84a6d23 100644
--- a/src/libraries/System.Diagnostics.Process/src/System/Diagnostics/Process.Linux.cs
+++ b/src/libraries/System.Diagnostics.Process/src/System/Diagnostics/Process.Linux.cs
@@ -7,6 +7,7 @@
using System.ComponentModel;
using System.Globalization;
using System.IO;
+using System.Runtime.Versioning;
using System.Text;
namespace System.Diagnostics
@@ -17,6 +18,9 @@ public partial class Process : IDisposable
/// Creates an array of components that are associated with process resources on a
/// remote computer. These process resources share the specified process name.
///
+ [UnsupportedOSPlatform("ios")]
+ [UnsupportedOSPlatform("tvos")]
+ [SupportedOSPlatform("maccatalyst")]
public static Process[] GetProcessesByName(string? processName, string machineName)
{
ProcessManager.ThrowIfRemoteMachine(machineName);
diff --git a/src/libraries/System.Diagnostics.Process/src/System/Diagnostics/Process.NonUap.cs b/src/libraries/System.Diagnostics.Process/src/System/Diagnostics/Process.NonUap.cs
index 0dff87802214e9..2bad9c22c9b6d9 100644
--- a/src/libraries/System.Diagnostics.Process/src/System/Diagnostics/Process.NonUap.cs
+++ b/src/libraries/System.Diagnostics.Process/src/System/Diagnostics/Process.NonUap.cs
@@ -11,6 +11,7 @@ public partial class Process : IDisposable
{
[UnsupportedOSPlatform("ios")]
[UnsupportedOSPlatform("tvos")]
+ [SupportedOSPlatform("maccatalyst")]
public void Kill(bool entireProcessTree)
{
if (!entireProcessTree)
diff --git a/src/libraries/System.Diagnostics.Process/src/System/Diagnostics/Process.Unix.cs b/src/libraries/System.Diagnostics.Process/src/System/Diagnostics/Process.Unix.cs
index 69b4481ae2087b..0cbb98891ab235 100644
--- a/src/libraries/System.Diagnostics.Process/src/System/Diagnostics/Process.Unix.cs
+++ b/src/libraries/System.Diagnostics.Process/src/System/Diagnostics/Process.Unix.cs
@@ -58,9 +58,10 @@ public static Process Start(string fileName, string arguments, string userName,
/// Terminates the associated process immediately.
[UnsupportedOSPlatform("ios")]
[UnsupportedOSPlatform("tvos")]
+ [SupportedOSPlatform("maccatalyst")]
public void Kill()
{
- if (OperatingSystem.IsIOS() || OperatingSystem.IsTvOS())
+ if (PlatformDoesNotSupportProcessStartAndKill)
{
throw new PlatformNotSupportedException();
}
@@ -372,7 +373,7 @@ private SafeProcessHandle GetProcessHandle()
/// The start info with which to start the process.
private bool StartCore(ProcessStartInfo startInfo)
{
- if (OperatingSystem.IsIOS() || OperatingSystem.IsTvOS())
+ if (PlatformDoesNotSupportProcessStartAndKill)
{
throw new PlatformNotSupportedException();
}
@@ -1105,5 +1106,8 @@ private static int OnSigChild(int reapAll, int configureConsole)
s_processStartLock.ExitWriteLock();
}
}
+
+ private static bool PlatformDoesNotSupportProcessStartAndKill
+ => (OperatingSystem.IsIOS() && !OperatingSystem.IsMacCatalyst()) || OperatingSystem.IsTvOS();
}
}
diff --git a/src/libraries/System.Diagnostics.Process/src/System/Diagnostics/Process.UnknownUnix.cs b/src/libraries/System.Diagnostics.Process/src/System/Diagnostics/Process.UnknownUnix.cs
index 46c652a7fb6a69..f56acfbbb5e0fa 100644
--- a/src/libraries/System.Diagnostics.Process/src/System/Diagnostics/Process.UnknownUnix.cs
+++ b/src/libraries/System.Diagnostics.Process/src/System/Diagnostics/Process.UnknownUnix.cs
@@ -9,7 +9,10 @@ public partial class Process : IDisposable
/// Creates an array of components that are associated with process resources on a
/// remote computer. These process resources share the specified process name.
///
- public static Process[] GetProcessesByName(string processName, string machineName)
+ [UnsupportedOSPlatform("ios")]
+ [UnsupportedOSPlatform("tvos")]
+ [SupportedOSPlatform("maccatalyst")]
+ public static Process[] GetProcessesByName(string? processName, string machineName)
{
throw new PlatformNotSupportedException();
}
@@ -82,5 +85,6 @@ private string GetPathToOpenFile()
throw new PlatformNotSupportedException();
}
+ private int ParentProcessId => throw new PlatformNotSupportedException();
}
}
diff --git a/src/libraries/System.Diagnostics.Process/src/System/Diagnostics/Process.Windows.cs b/src/libraries/System.Diagnostics.Process/src/System/Diagnostics/Process.Windows.cs
index 9c59f54333bf64..8935edc549ba98 100644
--- a/src/libraries/System.Diagnostics.Process/src/System/Diagnostics/Process.Windows.cs
+++ b/src/libraries/System.Diagnostics.Process/src/System/Diagnostics/Process.Windows.cs
@@ -21,6 +21,9 @@ public partial class Process : IDisposable
/// Creates an array of components that are associated with process resources on a
/// remote computer. These process resources share the specified process name.
///
+ [UnsupportedOSPlatform("ios")]
+ [UnsupportedOSPlatform("tvos")]
+ [SupportedOSPlatform("maccatalyst")]
public static Process[] GetProcessesByName(string? processName, string machineName)
{
if (processName == null)
@@ -91,6 +94,7 @@ public static void LeaveDebugMode()
/// Terminates the associated process immediately.
[UnsupportedOSPlatform("ios")]
[UnsupportedOSPlatform("tvos")]
+ [SupportedOSPlatform("maccatalyst")]
public void Kill()
{
using (SafeProcessHandle handle = GetProcessHandle(Interop.Advapi32.ProcessOptions.PROCESS_TERMINATE | Interop.Advapi32.ProcessOptions.PROCESS_QUERY_LIMITED_INFORMATION, throwIfExited: false))
diff --git a/src/libraries/System.Diagnostics.Process/src/System/Diagnostics/Process.cs b/src/libraries/System.Diagnostics.Process/src/System/Diagnostics/Process.cs
index 0c5bf3a96542ae..a1796844b59810 100644
--- a/src/libraries/System.Diagnostics.Process/src/System/Diagnostics/Process.cs
+++ b/src/libraries/System.Diagnostics.Process/src/System/Diagnostics/Process.cs
@@ -193,6 +193,9 @@ public bool HasExited
}
/// Gets the time the associated process was started.
+ [UnsupportedOSPlatform("ios")]
+ [UnsupportedOSPlatform("tvos")]
+ [SupportedOSPlatform("maccatalyst")]
public DateTime StartTime
{
get
@@ -262,14 +265,16 @@ public IntPtr MaxWorkingSet
{
[UnsupportedOSPlatform("ios")]
[UnsupportedOSPlatform("tvos")]
+ [SupportedOSPlatform("maccatalyst")]
get
{
EnsureWorkingSetLimits();
return _maxWorkingSet;
}
- [SupportedOSPlatform("windows")]
- [SupportedOSPlatform("macos")]
[SupportedOSPlatform("freebsd")]
+ [SupportedOSPlatform("macos")]
+ [SupportedOSPlatform("maccatalyst")]
+ [SupportedOSPlatform("windows")]
set
{
SetWorkingSetLimits(null, value);
@@ -284,14 +289,16 @@ public IntPtr MinWorkingSet
{
[UnsupportedOSPlatform("ios")]
[UnsupportedOSPlatform("tvos")]
+ [SupportedOSPlatform("maccatalyst")]
get
{
EnsureWorkingSetLimits();
return _minWorkingSet;
}
- [SupportedOSPlatform("windows")]
- [SupportedOSPlatform("macos")]
[SupportedOSPlatform("freebsd")]
+ [SupportedOSPlatform("macos")]
+ [SupportedOSPlatform("maccatalyst")]
+ [SupportedOSPlatform("windows")]
set
{
SetWorkingSetLimits(value, null);
@@ -1039,6 +1046,9 @@ public static Process GetProcessById(int processId)
/// local computer. These process resources share the specified process name.
///
///
+ [UnsupportedOSPlatform("ios")]
+ [UnsupportedOSPlatform("tvos")]
+ [SupportedOSPlatform("maccatalyst")]
public static Process[] GetProcessesByName(string? processName)
{
return GetProcessesByName(processName, ".");
@@ -1050,6 +1060,9 @@ public static Process[] GetProcessesByName(string? processName)
/// component for each process resource on the local computer.
///
///
+ [UnsupportedOSPlatform("ios")]
+ [UnsupportedOSPlatform("tvos")]
+ [SupportedOSPlatform("maccatalyst")]
public static Process[] GetProcesses()
{
return GetProcesses(".");
@@ -1062,6 +1075,9 @@ public static Process[] GetProcesses()
/// process resource on the specified computer.
///
///
+ [UnsupportedOSPlatform("ios")]
+ [UnsupportedOSPlatform("tvos")]
+ [SupportedOSPlatform("maccatalyst")]
public static Process[] GetProcesses(string machineName)
{
bool isRemoteMachine = ProcessManager.IsRemoteMachine(machineName);
@@ -1205,6 +1221,7 @@ private void SetProcessId(int processId)
///
[UnsupportedOSPlatform("ios")]
[UnsupportedOSPlatform("tvos")]
+ [SupportedOSPlatform("maccatalyst")]
public bool Start()
{
Close();
@@ -1248,6 +1265,7 @@ public bool Start()
///
[UnsupportedOSPlatform("ios")]
[UnsupportedOSPlatform("tvos")]
+ [SupportedOSPlatform("maccatalyst")]
public static Process Start(string fileName)
{
// the underlying Start method can only return null on Windows platforms,
@@ -1266,6 +1284,7 @@ public static Process Start(string fileName)
///
[UnsupportedOSPlatform("ios")]
[UnsupportedOSPlatform("tvos")]
+ [SupportedOSPlatform("maccatalyst")]
public static Process Start(string fileName, string arguments)
{
// the underlying Start method can only return null on Windows platforms,
@@ -1279,6 +1298,7 @@ public static Process Start(string fileName, string arguments)
///
[UnsupportedOSPlatform("ios")]
[UnsupportedOSPlatform("tvos")]
+ [SupportedOSPlatform("maccatalyst")]
public static Process Start(string fileName, IEnumerable arguments)
{
if (fileName == null)
@@ -1305,6 +1325,7 @@ public static Process Start(string fileName, IEnumerable arguments)
///
[UnsupportedOSPlatform("ios")]
[UnsupportedOSPlatform("tvos")]
+ [SupportedOSPlatform("maccatalyst")]
public static Process? Start(ProcessStartInfo startInfo)
{
Process process = new Process();
diff --git a/src/libraries/System.Diagnostics.Process/src/System/Diagnostics/Process.iOS.cs b/src/libraries/System.Diagnostics.Process/src/System/Diagnostics/Process.iOS.cs
new file mode 100644
index 00000000000000..abbb712d4006ac
--- /dev/null
+++ b/src/libraries/System.Diagnostics.Process/src/System/Diagnostics/Process.iOS.cs
@@ -0,0 +1,124 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Runtime.Versioning;
+
+namespace System.Diagnostics
+{
+ public partial class Process : IDisposable
+ {
+ [UnsupportedOSPlatform("ios")]
+ [UnsupportedOSPlatform("tvos")]
+ [SupportedOSPlatform("maccatalyst")]
+ public void Kill(bool entireProcessTree)
+ {
+ throw new PlatformNotSupportedException();
+ }
+
+ ///
+ /// Creates an array of components that are associated with process resources on a
+ /// remote computer. These process resources share the specified process name.
+ ///
+ [UnsupportedOSPlatform("ios")]
+ [UnsupportedOSPlatform("tvos")]
+ [SupportedOSPlatform("maccatalyst")]
+ public static Process[] GetProcessesByName(string? processName, string machineName)
+ {
+ throw new PlatformNotSupportedException();
+ }
+
+ /// Gets the amount of time the process has spent running code inside the operating system core.
+ [UnsupportedOSPlatform("ios")]
+ [UnsupportedOSPlatform("tvos")]
+ public TimeSpan PrivilegedProcessorTime
+ {
+ get { throw new PlatformNotSupportedException(); }
+ }
+
+ /// Gets the time the associated process was started.
+ [UnsupportedOSPlatform("ios")]
+ [UnsupportedOSPlatform("tvos")]
+ internal DateTime StartTimeCore
+ {
+ get { throw new PlatformNotSupportedException(); }
+ }
+
+ ///
+ /// Gets the amount of time the associated process has spent utilizing the CPU.
+ /// It is the sum of the and
+ /// .
+ ///
+ [UnsupportedOSPlatform("ios")]
+ [UnsupportedOSPlatform("tvos")]
+ public TimeSpan TotalProcessorTime
+ {
+ get { throw new PlatformNotSupportedException(); }
+ }
+
+ ///
+ /// Gets the amount of time the associated process has spent running code
+ /// inside the application portion of the process (not the operating system core).
+ ///
+ [UnsupportedOSPlatform("ios")]
+ [UnsupportedOSPlatform("tvos")]
+ public TimeSpan UserProcessorTime
+ {
+ get { throw new PlatformNotSupportedException(); }
+ }
+
+ ///
+ /// Returns all immediate child processes.
+ ///
+ private IReadOnlyList GetChildProcesses(Process[]? processes = null)
+ {
+ throw new PlatformNotSupportedException();
+ }
+
+ /// Gets parent process ID
+ private int GetParentProcessId =>
+ throw new PlatformNotSupportedException();
+
+ ///
+ /// Gets or sets which processors the threads in this process can be scheduled to run on.
+ ///
+ private IntPtr ProcessorAffinityCore
+ {
+ get { throw new PlatformNotSupportedException(); }
+ set { throw new PlatformNotSupportedException(); }
+ }
+
+ ///
+ /// Make sure we have obtained the min and max working set limits.
+ ///
+ private void GetWorkingSetLimits(out IntPtr minWorkingSet, out IntPtr maxWorkingSet)
+ {
+ throw new PlatformNotSupportedException();
+ }
+
+ /// Sets one or both of the minimum and maximum working set limits.
+ /// The new minimum working set limit, or null not to change it.
+ /// The new maximum working set limit, or null not to change it.
+ /// The resulting minimum working set limit after any changes applied.
+ /// The resulting maximum working set limit after any changes applied.
+ private void SetWorkingSetLimitsCore(IntPtr? newMin, IntPtr? newMax, out IntPtr resultingMin, out IntPtr resultingMax)
+ {
+ throw new PlatformNotSupportedException();
+ }
+
+ /// Gets execution path
+ private string GetPathToOpenFile()
+ {
+ throw new PlatformNotSupportedException();
+ }
+
+ private int ParentProcessId => throw new PlatformNotSupportedException();
+
+ private static bool IsProcessInvalidException(Exception e) =>
+ // InvalidOperationException signifies conditions such as the process already being dead.
+ // Win32Exception signifies issues such as insufficient permissions to get details on the process.
+ // In either case, the predicate couldn't be applied so return the fallback result.
+ e is InvalidOperationException || e is Win32Exception;
+ }
+}
diff --git a/src/libraries/System.Diagnostics.Process/src/System/Diagnostics/ProcessManager.Unix.cs b/src/libraries/System.Diagnostics.Process/src/System/Diagnostics/ProcessManager.Unix.cs
index 5df7ece329e1d3..1ef579803c622f 100644
--- a/src/libraries/System.Diagnostics.Process/src/System/Diagnostics/ProcessManager.Unix.cs
+++ b/src/libraries/System.Diagnostics.Process/src/System/Diagnostics/ProcessManager.Unix.cs
@@ -3,6 +3,7 @@
using Microsoft.Win32.SafeHandles;
using System.Collections.Generic;
+using System.Runtime.Versioning;
using System.Text;
namespace System.Diagnostics
@@ -44,6 +45,9 @@ public static bool IsProcessRunning(int processId)
/// Gets the IDs of all processes on the specified machine.
/// The machine to examine.
/// An array of process IDs from the specified machine.
+ [UnsupportedOSPlatform("ios")]
+ [UnsupportedOSPlatform("tvos")]
+ [SupportedOSPlatform("maccatalyst")]
public static int[] GetProcessIds(string machineName)
{
ThrowIfRemoteMachine(machineName);
diff --git a/src/libraries/System.Diagnostics.Process/src/System/Diagnostics/ProcessManager.iOS.cs b/src/libraries/System.Diagnostics.Process/src/System/Diagnostics/ProcessManager.iOS.cs
new file mode 100644
index 00000000000000..2fddb3b200e7e3
--- /dev/null
+++ b/src/libraries/System.Diagnostics.Process/src/System/Diagnostics/ProcessManager.iOS.cs
@@ -0,0 +1,39 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Runtime.Versioning;
+
+namespace System.Diagnostics
+{
+ internal static partial class ProcessManager
+ {
+ /// Gets the IDs of all processes on the current machine.
+ public static int[] GetProcessIds()
+ {
+ throw new PlatformNotSupportedException();
+ }
+
+ /// Gets process infos for each process on the specified machine.
+ /// The target machine.
+ /// An array of process infos, one per found process.
+ [UnsupportedOSPlatform("ios")]
+ [UnsupportedOSPlatform("tvos")]
+ public static ProcessInfo[] GetProcessInfos(string machineName)
+ {
+ throw new PlatformNotSupportedException();
+ }
+
+ /// Gets an array of module infos for the specified process.
+ /// The ID of the process whose modules should be enumerated.
+ /// The array of modules.
+ internal static ProcessModuleCollection GetModules(int processId)
+ {
+ return new ProcessModuleCollection(0);
+ }
+
+ private static ProcessInfo CreateProcessInfo(int pid)
+ {
+ throw new PlatformNotSupportedException();
+ }
+ }
+}
diff --git a/src/libraries/System.Diagnostics.Process/src/System/Diagnostics/ProcessThread.iOS.cs b/src/libraries/System.Diagnostics.Process/src/System/Diagnostics/ProcessThread.iOS.cs
new file mode 100644
index 00000000000000..8faa430900aabf
--- /dev/null
+++ b/src/libraries/System.Diagnostics.Process/src/System/Diagnostics/ProcessThread.iOS.cs
@@ -0,0 +1,56 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Runtime.Versioning;
+
+namespace System.Diagnostics
+{
+ public partial class ProcessThread
+ {
+ ///
+ /// Returns or sets the priority level of the associated thread. The priority level is
+ /// not an absolute level, but instead contributes to the actual thread priority by
+ /// considering the priority class of the process.
+ ///
+ private ThreadPriorityLevel PriorityLevelCore
+ {
+ get { throw new PlatformNotSupportedException(); }
+ set { throw new PlatformNotSupportedException(); }
+ }
+
+ ///
+ /// Returns the amount of time the thread has spent running code inside the operating
+ /// system core.
+ ///
+ [UnsupportedOSPlatform("ios")]
+ [UnsupportedOSPlatform("tvos")]
+ public TimeSpan PrivilegedProcessorTime
+ {
+ get { throw new PlatformNotSupportedException(); }
+ }
+
+ private DateTime GetStartTime() => throw new PlatformNotSupportedException();
+ ///
+ /// Returns the amount of time the associated thread has spent utilizing the CPU.
+ /// It is the sum of the System.Diagnostics.ProcessThread.UserProcessorTime and
+ /// System.Diagnostics.ProcessThread.PrivilegedProcessorTime.
+ ///
+ [UnsupportedOSPlatform("ios")]
+ [UnsupportedOSPlatform("tvos")]
+ public TimeSpan TotalProcessorTime
+ {
+ get { throw new PlatformNotSupportedException(); }
+ }
+
+ ///
+ /// Returns the amount of time the associated thread has spent running code
+ /// inside the application (not the operating system core).
+ ///
+ [UnsupportedOSPlatform("ios")]
+ [UnsupportedOSPlatform("tvos")]
+ public TimeSpan UserProcessorTime
+ {
+ get { throw new PlatformNotSupportedException(); }
+ }
+ }
+}
diff --git a/src/libraries/System.Diagnostics.Process/src/System/Diagnostics/ThreadInfo.cs b/src/libraries/System.Diagnostics.Process/src/System/Diagnostics/ThreadInfo.cs
index c12c143e5a53a1..1205e732e67328 100644
--- a/src/libraries/System.Diagnostics.Process/src/System/Diagnostics/ThreadInfo.cs
+++ b/src/libraries/System.Diagnostics.Process/src/System/Diagnostics/ThreadInfo.cs
@@ -12,6 +12,7 @@ namespace System.Diagnostics
///
internal sealed class ThreadInfo
{
+#pragma warning disable CS0649 // The fields are unused on iOS/tvOS as the respective managed logic (mostly around libproc) is excluded.
internal ulong _threadId;
internal int _processId;
internal int _basePriority;
@@ -19,5 +20,6 @@ internal sealed class ThreadInfo
internal IntPtr _startAddress;
internal ThreadState _threadState;
internal ThreadWaitReason _threadWaitReason;
+#pragma warning restore CS0649
}
}
diff --git a/src/libraries/System.Diagnostics.Process/tests/ProcessModuleTests.cs b/src/libraries/System.Diagnostics.Process/tests/ProcessModuleTests.cs
index 33f84717da7198..fd4e9d2751753f 100644
--- a/src/libraries/System.Diagnostics.Process/tests/ProcessModuleTests.cs
+++ b/src/libraries/System.Diagnostics.Process/tests/ProcessModuleTests.cs
@@ -10,6 +10,7 @@ namespace System.Diagnostics.Tests
public partial class ProcessModuleTests : ProcessTestBase
{
[Fact]
+ [SkipOnPlatform(TestPlatforms.iOS | TestPlatforms.tvOS, "libproc is not supported on iOS/tvOS")]
public void TestModuleProperties()
{
ProcessModuleCollection modules = Process.GetCurrentProcess().Modules;
@@ -29,6 +30,7 @@ public void TestModuleProperties()
}
[Fact]
+ [SkipOnPlatform(TestPlatforms.iOS | TestPlatforms.tvOS, "libproc is not supported on iOS/tvOS")]
public void Modules_Get_ContainsHostFileName()
{
ProcessModuleCollection modules = Process.GetCurrentProcess().Modules;
diff --git a/src/libraries/System.Diagnostics.Process/tests/ProcessStartInfoTests.cs b/src/libraries/System.Diagnostics.Process/tests/ProcessStartInfoTests.cs
index 38062773cb3671..6f304b08989f55 100644
--- a/src/libraries/System.Diagnostics.Process/tests/ProcessStartInfoTests.cs
+++ b/src/libraries/System.Diagnostics.Process/tests/ProcessStartInfoTests.cs
@@ -1318,7 +1318,7 @@ private void VerifyNotepadMainWindowTitle(Process process, string filename)
string expected = Path.GetFileNameWithoutExtension(filename);
process.WaitForInputIdle(); // Give the file a chance to load
- Assert.Equal("notepad", process.ProcessName);
+ Assert.Equal("notepad", process.ProcessName.ToLower());
// Notepad calls CreateWindowEx with pWindowName of empty string, then calls SetWindowTextW
// with "Untitled - Notepad" then finally if you're opening a file, calls SetWindowTextW
diff --git a/src/libraries/System.Diagnostics.Process/tests/ProcessTests.Unix.cs b/src/libraries/System.Diagnostics.Process/tests/ProcessTests.Unix.cs
index 63d7f3d6d02b3c..e27e143f75b642 100644
--- a/src/libraries/System.Diagnostics.Process/tests/ProcessTests.Unix.cs
+++ b/src/libraries/System.Diagnostics.Process/tests/ProcessTests.Unix.cs
@@ -78,6 +78,7 @@ public void ProcessStart_UseShellExecute_OnLinux_ThrowsIfNoProgramInstalled()
[Fact]
[OuterLoop("Opens program")]
+ [SkipOnPlatform(TestPlatforms.MacCatalyst, "In App Sandbox mode, the process doesn't have read access to the binary.")]
public void ProcessStart_DirectoryNameInCurDirectorySameAsFileNameInExecDirectory_Success()
{
string fileToOpen = "dotnet";
@@ -157,8 +158,8 @@ public void ProcessStart_UseShellExecute_OnUnix_SuccessWhenProgramInstalled(bool
}
[Fact]
- [SkipOnPlatform(TestPlatforms.OSX, "On OSX, ProcessName returns the script interpreter.")]
- [SkipOnPlatform(TestPlatforms.iOS | TestPlatforms.MacCatalyst | TestPlatforms.tvOS, "Not supported on iOS, MacCatalyst, or tvOS.")]
+ [SkipOnPlatform(TestPlatforms.OSX | TestPlatforms.MacCatalyst, "On OSX, ProcessName returns the script interpreter.")]
+ [SkipOnPlatform(TestPlatforms.iOS | TestPlatforms.tvOS, "Not supported on iOS or tvOS.")]
public void ProcessNameMatchesScriptName()
{
string scriptName = GetTestFileName();
@@ -379,7 +380,7 @@ public void ProcessStart_OnLinux_UsesSpecifiedProgramUsingArgumentList()
}
[Theory, InlineData("/usr/bin/open"), InlineData("/usr/bin/nano")]
- [PlatformSpecific(TestPlatforms.OSX)]
+ [PlatformSpecific(TestPlatforms.OSX | TestPlatforms.MacCatalyst)]
[OuterLoop("Opens program")]
public void ProcessStart_OpenFileOnOsx_UsesSpecifiedProgram(string programToOpenWith)
{
@@ -396,7 +397,7 @@ public void ProcessStart_OpenFileOnOsx_UsesSpecifiedProgram(string programToOpen
}
[Theory, InlineData("Safari"), InlineData("\"Google Chrome\"")]
- [PlatformSpecific(TestPlatforms.OSX)]
+ [PlatformSpecific(TestPlatforms.OSX | TestPlatforms.MacCatalyst)]
[OuterLoop("Opens browser")]
public void ProcessStart_OpenUrl_UsesSpecifiedApplication(string applicationToOpenWith)
{
@@ -410,7 +411,7 @@ public void ProcessStart_OpenUrl_UsesSpecifiedApplication(string applicationToOp
}
[Theory, InlineData("-a Safari"), InlineData("-a \"Google Chrome\"")]
- [PlatformSpecific(TestPlatforms.OSX)]
+ [PlatformSpecific(TestPlatforms.OSX | TestPlatforms.MacCatalyst)]
[OuterLoop("Opens browser")]
public void ProcessStart_UseShellExecuteTrue_OpenUrl_SuccessfullyReadsArgument(string arguments)
{
@@ -432,7 +433,7 @@ public void ProcessStart_UseShellExecuteTrue_OpenUrl_SuccessfullyReadsArgument(s
[Theory,
MemberData(nameof(StartOSXProcessWithArgumentList))]
- [PlatformSpecific(TestPlatforms.OSX)]
+ [PlatformSpecific(TestPlatforms.OSX | TestPlatforms.MacCatalyst)]
[OuterLoop("Opens browser")]
public void ProcessStart_UseShellExecuteTrue_OpenUrl_SuccessfullyReadsArgumentArray(string[] argumentList)
{
@@ -502,7 +503,7 @@ public void TestBasePriorityOnUnix()
}
[Fact]
- [SkipOnPlatform(TestPlatforms.iOS | TestPlatforms.MacCatalyst | TestPlatforms.tvOS, "Not supported on iOS, MacCatalyst, or tvOS.")]
+ [SkipOnPlatform(TestPlatforms.iOS | TestPlatforms.tvOS, "Not supported on iOS or tvOS.")]
public void TestStartOnUnixWithBadPermissions()
{
string path = GetTestFilePath();
@@ -514,7 +515,7 @@ public void TestStartOnUnixWithBadPermissions()
}
[Fact]
- [SkipOnPlatform(TestPlatforms.iOS | TestPlatforms.MacCatalyst | TestPlatforms.tvOS, "Not supported on iOS, MacCatalyst, or tvOS.")]
+ [SkipOnPlatform(TestPlatforms.iOS | TestPlatforms.tvOS, "Not supported on iOS or tvOS.")]
public void TestStartOnUnixWithBadFormat()
{
string path = GetTestFilePath();
diff --git a/src/libraries/System.Diagnostics.Process/tests/ProcessTests.cs b/src/libraries/System.Diagnostics.Process/tests/ProcessTests.cs
index 880da43a646539..febe1a0e8e767a 100644
--- a/src/libraries/System.Diagnostics.Process/tests/ProcessTests.cs
+++ b/src/libraries/System.Diagnostics.Process/tests/ProcessTests.cs
@@ -171,28 +171,28 @@ public void TestExited_SynchronizingObject(bool invokeRequired)
}
[Fact]
- [SkipOnPlatform(TestPlatforms.iOS | TestPlatforms.tvOS | TestPlatforms.MacCatalyst, "Not supported on iOS, tvOS, or MacCatalyst.")]
+ [SkipOnPlatform(TestPlatforms.iOS | TestPlatforms.tvOS, "Not supported on iOS and tvOS.")]
public void ProcessStart_TryExitCommandAsFileName_ThrowsWin32Exception()
{
Assert.Throws(() => Process.Start(new ProcessStartInfo { UseShellExecute = false, FileName = "exit", Arguments = "42" }));
}
[Fact]
- [SkipOnPlatform(TestPlatforms.iOS | TestPlatforms.tvOS | TestPlatforms.MacCatalyst, "Not supported on iOS, tvOS, or MacCatalyst.")]
+ [SkipOnPlatform(TestPlatforms.iOS | TestPlatforms.tvOS, "Not supported on iOS and tvOS.")]
public void ProcessStart_UseShellExecuteFalse_FilenameIsUrl_ThrowsWin32Exception()
{
Assert.Throws(() => Process.Start(new ProcessStartInfo { UseShellExecute = false, FileName = "https://www.github.com/corefx" }));
}
[Fact]
- [SkipOnPlatform(TestPlatforms.iOS | TestPlatforms.tvOS | TestPlatforms.MacCatalyst, "Not supported on iOS, tvOS, or MacCatalyst.")]
+ [SkipOnPlatform(TestPlatforms.iOS | TestPlatforms.tvOS, "Not supported on iOS and tvOS.")]
public void ProcessStart_TryOpenFolder_UseShellExecuteIsFalse_ThrowsWin32Exception()
{
Assert.Throws(() => Process.Start(new ProcessStartInfo { UseShellExecute = false, FileName = Path.GetTempPath() }));
}
[Fact]
- [SkipOnPlatform(TestPlatforms.iOS | TestPlatforms.tvOS | TestPlatforms.MacCatalyst, "Not supported on iOS, tvOS, or MacCatalyst.")]
+ [SkipOnPlatform(TestPlatforms.iOS | TestPlatforms.tvOS, "Not supported on iOS and tvOS.")]
public void TestStartWithBadWorkingDirectory()
{
string program;
@@ -230,7 +230,7 @@ public void TestStartWithBadWorkingDirectory()
[ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.HasWindowsShell))]
[OuterLoop("Launches File Explorer")]
- [SkipOnPlatform(TestPlatforms.iOS | TestPlatforms.tvOS | TestPlatforms.MacCatalyst, "Not supported on iOS, tvOS, or MacCatalyst.")]
+ [SkipOnPlatform(TestPlatforms.iOS | TestPlatforms.tvOS, "Not supported on iOS and tvOS.")]
public void ProcessStart_UseShellExecute_OnWindows_OpenMissingFile_Throws()
{
string fileToOpen = Path.Combine(Environment.CurrentDirectory, "_no_such_file.TXT");
@@ -243,7 +243,7 @@ public void ProcessStart_UseShellExecute_OnWindows_OpenMissingFile_Throws()
[InlineData(true)]
[InlineData(false)]
[OuterLoop("Launches File Explorer")]
- [SkipOnPlatform(TestPlatforms.iOS | TestPlatforms.tvOS | TestPlatforms.MacCatalyst, "Not supported on iOS, tvOS, or MacCatalyst.")]
+ [SkipOnPlatform(TestPlatforms.iOS | TestPlatforms.tvOS, "Not supported on iOS and tvOS.")]
public void ProcessStart_UseShellExecute_OnWindows_DoesNotThrow(bool isFolder)
{
string fileToOpen;
@@ -267,21 +267,27 @@ public void ProcessStart_UseShellExecute_OnWindows_DoesNotThrow(bool isFolder)
{
if (px != null) // sometimes process is null
{
- Assert.Equal("notepad", px.ProcessName);
-
- px.Kill();
- Assert.True(px.WaitForExit(WaitInMS));
- px.WaitForExit(); // wait for event handlers to complete
+ try
+ {
+ Assert.Equal("notepad", px.ProcessName.ToLower());
+ }
+ finally
+ {
+ px.Kill();
+ Assert.True(px.WaitForExit(WaitInMS));
+ px.WaitForExit(); // wait for event handlers to complete
+ }
}
}
}
}
[ConditionalTheory(typeof(PlatformDetection), nameof(PlatformDetection.IsNotWindowsServerCore),
- nameof(PlatformDetection.IsNotWindowsNanoServer), nameof(PlatformDetection.IsNotWindowsIoTCore))]
+ nameof(PlatformDetection.IsNotWindowsNanoServer), nameof(PlatformDetection.IsNotWindowsIoTCore),
+ nameof(PlatformDetection.IsNotAppSandbox))]
[ActiveIssue("https://github.com/dotnet/runtime/issues/34685", TestPlatforms.Windows, TargetFrameworkMonikers.Netcoreapp, TestRuntimes.Mono)]
[InlineData(true), InlineData(false)]
- [SkipOnPlatform(TestPlatforms.iOS | TestPlatforms.MacCatalyst | TestPlatforms.tvOS, "Not supported on iOS, MacCatalyst, or tvOS.")]
+ [SkipOnPlatform(TestPlatforms.iOS | TestPlatforms.tvOS, "Not supported on iOS and tvOS.")]
public void ProcessStart_UseShellExecute_Executes(bool filenameAsUrl)
{
string filename = WriteScriptFile(TestDirectory, GetTestFileName(), returnValue: 42);
@@ -304,7 +310,9 @@ public void ProcessStart_UseShellExecute_Executes(bool filenameAsUrl)
PlatformDetection.IsNotWindowsIoTCore &&
RemoteExecutor.IsSupported;
- [ConditionalFact(nameof(UseShellExecuteExecuteOrderIsRunnablePlatform))]
+ private static bool IsNotAppSandbox => PlatformDetection.IsNotAppSandbox;
+
+ [ConditionalFact(nameof(UseShellExecuteExecuteOrderIsRunnablePlatform), nameof(IsNotAppSandbox))]
[ActiveIssue("https://github.com/dotnet/runtime/issues/34685", TestPlatforms.Windows, TargetFrameworkMonikers.Netcoreapp, TestRuntimes.Mono)]
public void ProcessStart_UseShellExecute_ExecuteOrder()
{
@@ -348,9 +356,10 @@ public void ProcessStart_UseShellExecute_ExecuteOrder()
}
[ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsNotWindowsServerCore),
- nameof(PlatformDetection.IsNotWindowsNanoServer), nameof(PlatformDetection.IsNotWindowsIoTCore))]
+ nameof(PlatformDetection.IsNotWindowsNanoServer), nameof(PlatformDetection.IsNotWindowsIoTCore),
+ nameof(PlatformDetection.IsNotAppSandbox))]
[ActiveIssue("https://github.com/dotnet/runtime/issues/34685", TestPlatforms.Windows, TargetFrameworkMonikers.Netcoreapp, TestRuntimes.Mono)]
- [SkipOnPlatform(TestPlatforms.iOS | TestPlatforms.MacCatalyst | TestPlatforms.tvOS, "Not supported on iOS, MacCatalyst, or tvOS.")]
+ [SkipOnPlatform(TestPlatforms.iOS | TestPlatforms.tvOS, "Not supported on iOS and tvOS.")]
public void ProcessStart_UseShellExecute_WorkingDirectory()
{
// Create a directory that will ProcessStartInfo.WorkingDirectory
@@ -414,6 +423,7 @@ public void TestExitTime()
}
[Fact]
+ [SkipOnPlatform(TestPlatforms.iOS | TestPlatforms.tvOS, "libproc is not supported on iOS/tvOS")]
public void StartTime_GetNotStarted_ThrowsInvalidOperationException()
{
var process = new Process();
@@ -501,7 +511,7 @@ public void HasExited_GetNotStarted_ThrowsInvalidOperationException()
}
[Fact]
- [SkipOnPlatform(TestPlatforms.iOS | TestPlatforms.tvOS | TestPlatforms.MacCatalyst, "Not supported on iOS, tvOS, or MacCatalyst.")]
+ [SkipOnPlatform(TestPlatforms.iOS | TestPlatforms.tvOS, "Not supported on iOS and tvOS.")]
public void Kill_NotStarted_ThrowsInvalidOperationException()
{
var process = new Process();
@@ -525,6 +535,7 @@ public void MachineName_GetNotStarted_ThrowsInvalidOperationException()
}
[Fact]
+ [SkipOnPlatform(TestPlatforms.iOS | TestPlatforms.tvOS, "libproc is not supported on iOS/tvOS")]
public void TestMainModule()
{
Process p = Process.GetCurrentProcess();
@@ -854,6 +865,7 @@ public void TotalProcessorTime_PerformLoop_TotalProcessorTimeValid()
}
[Fact]
+ [SkipOnPlatform(TestPlatforms.iOS | TestPlatforms.tvOS, "libproc is not supported on iOS/tvOS")]
public void UserProcessorTime_GetNotStarted_ThrowsInvalidOperationException()
{
var process = new Process();
@@ -861,6 +873,7 @@ public void UserProcessorTime_GetNotStarted_ThrowsInvalidOperationException()
}
[Fact]
+ [SkipOnPlatform(TestPlatforms.iOS | TestPlatforms.tvOS, "libproc is not supported on iOS/tvOS")]
public void PriviledgedProcessorTime_GetNotStarted_ThrowsInvalidOperationException()
{
var process = new Process();
@@ -868,6 +881,7 @@ public void PriviledgedProcessorTime_GetNotStarted_ThrowsInvalidOperationExcepti
}
[Fact]
+ [SkipOnPlatform(TestPlatforms.iOS | TestPlatforms.tvOS, "libproc is not supported on iOS/tvOS")]
public void TotalProcessorTime_GetNotStarted_ThrowsInvalidOperationException()
{
var process = new Process();
@@ -1105,6 +1119,7 @@ public void TestGetProcessById()
}
[Fact]
+ [SkipOnPlatform(TestPlatforms.iOS | TestPlatforms.tvOS, "libproc is not supported on iOS/tvOS")]
public void TestGetProcesses()
{
Process currentProcess = Process.GetCurrentProcess();
@@ -1170,6 +1185,7 @@ public void GetProcesses_RemoteMachinePath_ReturnsExpected()
}
[Fact]
+ [SkipOnPlatform(TestPlatforms.iOS | TestPlatforms.tvOS, "libproc is not supported on iOS/tvOS")]
public void GetProcessesByName_ProcessName_ReturnsExpected()
{
// Get the current process using its name
@@ -1229,6 +1245,7 @@ public static IEnumerable MachineName_Remote_TestData()
[Theory]
[MemberData(nameof(MachineName_TestData))]
+ [SkipOnPlatform(TestPlatforms.iOS | TestPlatforms.tvOS, "libproc is not supported on iOS/tvOS")]
public void GetProcessesByName_ProcessNameMachineName_ReturnsExpected(string machineName)
{
Process currentProcess = Process.GetCurrentProcess();
@@ -1255,6 +1272,7 @@ public void GetProcessesByName_RemoteMachineNameWindows_ReturnsExpected(string m
}
[Fact]
+ [SkipOnPlatform(TestPlatforms.iOS | TestPlatforms.tvOS, "libproc is not supported on iOS/tvOS")]
public void GetProcessesByName_NoSuchProcess_ReturnsEmpty()
{
string processName = Guid.NewGuid().ToString("N");
@@ -1262,6 +1280,7 @@ public void GetProcessesByName_NoSuchProcess_ReturnsEmpty()
}
[Fact]
+ [SkipOnPlatform(TestPlatforms.iOS | TestPlatforms.tvOS, "libproc is not supported on iOS/tvOS")]
public void GetProcessesByName_NullMachineName_ThrowsArgumentNullException()
{
Process currentProcess = Process.GetCurrentProcess();
@@ -1269,6 +1288,7 @@ public void GetProcessesByName_NullMachineName_ThrowsArgumentNullException()
}
[Fact]
+ [SkipOnPlatform(TestPlatforms.iOS | TestPlatforms.tvOS, "libproc is not supported on iOS/tvOS")]
public void GetProcessesByName_EmptyMachineName_ThrowsArgumentException()
{
Process currentProcess = Process.GetCurrentProcess();
@@ -1331,6 +1351,7 @@ public void StartInfo_SetOnRunningProcess_ThrowsInvalidOperationException()
}
[Fact]
+ [SkipOnPlatform(TestPlatforms.iOS | TestPlatforms.tvOS, "libproc is not supported on iOS/tvOS")]
public void StartInfo_SetGet_ReturnsExpected()
{
var process = new Process() { StartInfo = new ProcessStartInfo(RemoteExecutor.HostRunner) };
@@ -1407,7 +1428,7 @@ public void CanBeFinalized()
[Theory]
[InlineData(false)]
[InlineData(true)]
- [SkipOnPlatform(TestPlatforms.iOS | TestPlatforms.MacCatalyst | TestPlatforms.tvOS, "Not supported on iOS, MacCatalyst, or tvOS.")]
+ [SkipOnPlatform(TestPlatforms.iOS | TestPlatforms.tvOS, "Not supported on iOS and tvOS.")]
public void TestStartWithMissingFile(bool fullPath)
{
string path = Guid.NewGuid().ToString("N");
@@ -1715,6 +1736,7 @@ public void MainWindowTitle_GetWithGui_ShouldRefresh_Windows()
}
[Fact]
+ [SkipOnPlatform(TestPlatforms.iOS | TestPlatforms.tvOS, "libproc is not supported on iOS/tvOS")]
public void RefreshResetsAllRefreshableFields()
{
// testing Process.Responding using a real unresponsive process would be very hard to do properly
@@ -2271,6 +2293,7 @@ public void BothArgumentSetAndArgumentListSet()
}
[Fact]
+ [SkipOnPlatform(TestPlatforms.iOS | TestPlatforms.tvOS, "libproc is not supported on iOS/tvOS")]
public void Kill_EntireProcessTree_True_ProcessNotStarted_ThrowsInvalidOperationException()
{
var process = new Process();
@@ -2300,6 +2323,7 @@ public void Kill_EntireProcessTree_True_CalledByNonLocalProcess_ThrowsInvalidOpe
}
[Fact]
+ [SkipOnPlatform(TestPlatforms.iOS | TestPlatforms.tvOS, "libproc is not supported on iOS/tvOS")]
public void Kill_EntireProcessTree_True_CalledOnCallingProcess_ThrowsInvalidOperationException()
{
var process = Process.GetCurrentProcess();
diff --git a/src/libraries/System.Diagnostics.Process/tests/ProcessThreadTests.cs b/src/libraries/System.Diagnostics.Process/tests/ProcessThreadTests.cs
index 2266582ac5190f..6db4fd1a2cdeea 100644
--- a/src/libraries/System.Diagnostics.Process/tests/ProcessThreadTests.cs
+++ b/src/libraries/System.Diagnostics.Process/tests/ProcessThreadTests.cs
@@ -46,6 +46,7 @@ public void TestCommonPriorityAndTimeProperties()
}
[Fact]
+ [SkipOnPlatform(TestPlatforms.iOS | TestPlatforms.tvOS, "libproc is not supported on iOS/tvOS")]
public void TestThreadCount()
{
int numOfThreads = 10;
@@ -161,6 +162,7 @@ await Task.Factory.StartNew(() =>
}
[Fact]
+ [SkipOnPlatform(TestPlatforms.iOS | TestPlatforms.tvOS, "libproc is not supported on iOS/tvOS")]
public void TestStartAddressProperty()
{
using (Process p = Process.GetCurrentProcess())
diff --git a/src/libraries/System.Diagnostics.TextWriterTraceListener/tests/XmlWriterTraceListenerTests.cs b/src/libraries/System.Diagnostics.TextWriterTraceListener/tests/XmlWriterTraceListenerTests.cs
index 418e7b04d952f0..d00e72ce7c12b7 100644
--- a/src/libraries/System.Diagnostics.TextWriterTraceListener/tests/XmlWriterTraceListenerTests.cs
+++ b/src/libraries/System.Diagnostics.TextWriterTraceListener/tests/XmlWriterTraceListenerTests.cs
@@ -12,6 +12,7 @@
namespace System.Diagnostics.TextWriterTraceListenerTests
{
+ [SkipOnPlatform(TestPlatforms.iOS | TestPlatforms.tvOS, "libproc is not supported on iOS/tvOS")]
public class XmlWriterTraceListenerTests : FileCleanupTestBase
{
private readonly string _processName;
diff --git a/src/libraries/System.Diagnostics.TraceSource/ref/System.Diagnostics.TraceSource.cs b/src/libraries/System.Diagnostics.TraceSource/ref/System.Diagnostics.TraceSource.cs
index 62e82e3e09c3b1..e57585e4d8fd7f 100644
--- a/src/libraries/System.Diagnostics.TraceSource/ref/System.Diagnostics.TraceSource.cs
+++ b/src/libraries/System.Diagnostics.TraceSource/ref/System.Diagnostics.TraceSource.cs
@@ -69,7 +69,7 @@ protected override void OnValueChanged() { }
public abstract partial class Switch
{
protected Switch(string displayName, string? description) { }
- protected Switch(string displayName, string? description, string? defaultSwitchValue) { }
+ protected Switch(string displayName, string? description, string defaultSwitchValue) { }
public System.Collections.Specialized.StringDictionary Attributes { get { throw null; } }
public string Description { get { throw null; } }
public string DisplayName { get { throw null; } }
diff --git a/src/libraries/System.Diagnostics.TraceSource/src/System/Diagnostics/Switch.cs b/src/libraries/System.Diagnostics.TraceSource/src/System/Diagnostics/Switch.cs
index 23b40732ea4b5a..583d4cc1c8a050 100644
--- a/src/libraries/System.Diagnostics.TraceSource/src/System/Diagnostics/Switch.cs
+++ b/src/libraries/System.Diagnostics.TraceSource/src/System/Diagnostics/Switch.cs
@@ -24,7 +24,7 @@ public abstract class Switch
private volatile bool _initialized;
private bool _initializing;
private volatile string _switchValueString = string.Empty;
- private readonly string? _defaultValue;
+ private readonly string _defaultValue;
private object? _initializedLock;
private static readonly List> s_switches = new List>();
@@ -53,7 +53,7 @@ protected Switch(string displayName, string? description) : this(displayName, de
{
}
- protected Switch(string displayName, string? description, string? defaultSwitchValue)
+ protected Switch(string displayName, string? description, string defaultSwitchValue)
{
// displayName is used as a hashtable key, so it can never
// be null.
@@ -203,7 +203,7 @@ private bool InitializeWithStatus()
// called again, we don't want to get caught in an infinite loop.
_initializing = true;
- _switchValueString = _defaultValue!;
+ _switchValueString = _defaultValue;
OnValueChanged();
_initialized = true;
_initializing = false;
diff --git a/src/libraries/System.Diagnostics.Tracing/tests/BasicEventSourceTest/TestsWriteEventToListener.cs b/src/libraries/System.Diagnostics.Tracing/tests/BasicEventSourceTest/TestsWriteEventToListener.cs
index d7c7046ab693ed..97470a2ff4450e 100644
--- a/src/libraries/System.Diagnostics.Tracing/tests/BasicEventSourceTest/TestsWriteEventToListener.cs
+++ b/src/libraries/System.Diagnostics.Tracing/tests/BasicEventSourceTest/TestsWriteEventToListener.cs
@@ -452,6 +452,7 @@ public void Test_EventSourceCreatedEvents_AfterListener()
[Theory]
[InlineData(true)]
[InlineData(false)]
+ [ActiveIssue("https://github.com/dotnet/runtime/issues/51382", TestPlatforms.iOS | TestPlatforms.tvOS | TestPlatforms.MacCatalyst)]
public void Test_EventListenerThrows_ExceptionIsNotRethrownToCaller(bool setThrowOnEventWriteErrorsFlag)
{
TestUtilities.CheckNoEventSourcesRunning("Start");
diff --git a/src/libraries/System.DirectoryServices.AccountManagement/src/System.DirectoryServices.AccountManagement.csproj b/src/libraries/System.DirectoryServices.AccountManagement/src/System.DirectoryServices.AccountManagement.csproj
index b994abfb5ee24b..81b52cb94e34bf 100644
--- a/src/libraries/System.DirectoryServices.AccountManagement/src/System.DirectoryServices.AccountManagement.csproj
+++ b/src/libraries/System.DirectoryServices.AccountManagement/src/System.DirectoryServices.AccountManagement.csproj
@@ -97,10 +97,10 @@
-
+
@@ -115,7 +115,6 @@
-
diff --git a/src/libraries/System.DirectoryServices.Protocols/src/System.DirectoryServices.Protocols.csproj b/src/libraries/System.DirectoryServices.Protocols/src/System.DirectoryServices.Protocols.csproj
index d317292d1144a0..229b659e0231eb 100644
--- a/src/libraries/System.DirectoryServices.Protocols/src/System.DirectoryServices.Protocols.csproj
+++ b/src/libraries/System.DirectoryServices.Protocols/src/System.DirectoryServices.Protocols.csproj
@@ -1,4 +1,4 @@
-
+
true
true
@@ -6,6 +6,7 @@
true
true
true
+ 1
Provides the methods defined in the Lightweight Directory Access Protocol (LDAP) version 3 (V3) and Directory Services Markup Language (DSML) version 2.0 (V2) standards.
@@ -67,7 +68,11 @@
+
+
+ Common\System\LocalAppContextSwitches.Common.cs
+
Common\Interop\Linux\OpenLdap\Interop.Ldap.cs
diff --git a/src/libraries/System.DirectoryServices.Protocols/src/System/DirectoryServices/Protocols/Interop/LdapPal.Linux.cs b/src/libraries/System.DirectoryServices.Protocols/src/System/DirectoryServices/Protocols/Interop/LdapPal.Linux.cs
index 701fae26108282..a2619871edecb4 100644
--- a/src/libraries/System.DirectoryServices.Protocols/src/System/DirectoryServices/Protocols/Interop/LdapPal.Linux.cs
+++ b/src/libraries/System.DirectoryServices.Protocols/src/System/DirectoryServices/Protocols/Interop/LdapPal.Linux.cs
@@ -111,7 +111,7 @@ internal static int BindToDirectory(ConnectionHandle ld, string who, string pass
passwordPtr = LdapPal.StringToPtr(passwd);
berval passwordBerval = new berval
{
- bv_len = passwd.Length,
+ bv_len = passwd?.Length ?? 0,
bv_val = passwordPtr,
};
@@ -123,7 +123,31 @@ internal static int BindToDirectory(ConnectionHandle ld, string who, string pass
}
}
- internal static int StartTls(ConnectionHandle ldapHandle, ref int ServerReturnValue, ref IntPtr Message, IntPtr ServerControls, IntPtr ClientControls) => Interop.Ldap.ldap_start_tls(ldapHandle, ref ServerReturnValue, ref Message, ServerControls, ClientControls);
+ internal static int StartTls(ConnectionHandle ldapHandle, ref int serverReturnValue, ref IntPtr message, IntPtr serverControls, IntPtr clientControls)
+ {
+ // Windows and Linux have different signatures for ldap_start_tls_s.
+ // On Linux, we don't have a serverReturnValue or the message/result parameter.
+ //
+ // So in the PAL here, just emulate.
+
+ int error = Interop.Ldap.ldap_start_tls(ldapHandle, serverControls, clientControls);
+
+ // On Windows, serverReturnValue only has meaning if the result code is LDAP_OTHER.
+ // If OpenLDAP returns that, we don't have a better code, so assign that through.
+ // If we get any other error, assign serverReturnValue to 0 since it shouldn't be read.
+ if (error == (int)ResultCode.Other)
+ {
+ serverReturnValue = error;
+ }
+ else
+ {
+ serverReturnValue = 0;
+ }
+
+ // We don't have a referrer/message/result value, so just set it to NULL.
+ message = IntPtr.Zero;
+ return error;
+ }
// openldap doesn't have a ldap_stop_tls function. Returning true as no-op for Linux.
internal static byte StopTls(ConnectionHandle ldapHandle) => 1;
diff --git a/src/libraries/System.DirectoryServices.Protocols/src/System/DirectoryServices/Protocols/Interop/SafeHandles.Linux.cs b/src/libraries/System.DirectoryServices.Protocols/src/System/DirectoryServices/Protocols/Interop/SafeHandles.Linux.cs
index 2383e816e1ddb6..a7e43947e20314 100644
--- a/src/libraries/System.DirectoryServices.Protocols/src/System/DirectoryServices/Protocols/Interop/SafeHandles.Linux.cs
+++ b/src/libraries/System.DirectoryServices.Protocols/src/System/DirectoryServices/Protocols/Interop/SafeHandles.Linux.cs
@@ -16,6 +16,13 @@ public ConnectionHandle()
_needDispose = true;
}
+ internal ConnectionHandle(string uri)
+ :base(true)
+ {
+ Interop.Ldap.ldap_initialize(out handle, uri);
+ _needDispose = true;
+ }
+
internal ConnectionHandle(IntPtr value, bool disposeHandle) : base(true)
{
_needDispose = disposeHandle;
diff --git a/src/libraries/System.DirectoryServices.Protocols/src/System/DirectoryServices/Protocols/ldap/LdapConnection.Linux.cs b/src/libraries/System.DirectoryServices.Protocols/src/System/DirectoryServices/Protocols/ldap/LdapConnection.Linux.cs
index 02c8f0c239587b..6adf1ebac982cd 100644
--- a/src/libraries/System.DirectoryServices.Protocols/src/System/DirectoryServices/Protocols/ldap/LdapConnection.Linux.cs
+++ b/src/libraries/System.DirectoryServices.Protocols/src/System/DirectoryServices/Protocols/ldap/LdapConnection.Linux.cs
@@ -20,7 +20,7 @@ private void InternalInitConnectionHandle(string hostname)
throw new NullReferenceException();
}
- _ldapHandle = new ConnectionHandle();
+ _ldapHandle = new ConnectionHandle($"ldap://{hostname}:{((LdapDirectoryIdentifier)_directoryIdentifier).PortNumber}");
}
private int InternalConnectToServer()
@@ -79,13 +79,39 @@ private int InternalConnectToServer()
private int InternalBind(NetworkCredential tempCredential, SEC_WINNT_AUTH_IDENTITY_EX cred, BindMethod method)
{
int error;
- if (tempCredential == null && (AuthType == AuthType.External || AuthType == AuthType.Kerberos))
+
+ if (LocalAppContextSwitches.UseBasicAuthFallback)
{
- error = BindSasl();
+ if (tempCredential == null && (AuthType == AuthType.External || AuthType == AuthType.Kerberos))
+ {
+ error = BindSasl();
+ }
+ else
+ {
+ error = LdapPal.BindToDirectory(_ldapHandle, cred.user, cred.password);
+ }
}
else
{
- error = LdapPal.BindToDirectory(_ldapHandle, cred.user, cred.password);
+ if (method == BindMethod.LDAP_AUTH_NEGOTIATE)
+ {
+ if (tempCredential == null)
+ {
+ error = BindSasl();
+ }
+ else
+ {
+ // Explicit credentials were provided. If we call ldap_bind_s it will
+ // return LDAP_NOT_SUPPORTED, so just skip the P/Invoke.
+ error = (int)LdapError.NotSupported;
+ }
+ }
+ else
+ {
+ // Basic and Anonymous are handled elsewhere.
+ Debug.Assert(AuthType != AuthType.Anonymous && AuthType != AuthType.Basic);
+ error = (int)LdapError.AuthUnknown;
+ }
}
return error;
diff --git a/src/libraries/System.DirectoryServices.Protocols/src/System/DirectoryServices/Protocols/ldap/LdapSessionOptions.cs b/src/libraries/System.DirectoryServices.Protocols/src/System/DirectoryServices/Protocols/ldap/LdapSessionOptions.cs
index 5b28020eed2fd2..9a200fc5ba218b 100644
--- a/src/libraries/System.DirectoryServices.Protocols/src/System/DirectoryServices/Protocols/ldap/LdapSessionOptions.cs
+++ b/src/libraries/System.DirectoryServices.Protocols/src/System/DirectoryServices/Protocols/ldap/LdapSessionOptions.cs
@@ -641,11 +641,14 @@ public unsafe void StartTransportLayerSecurity(DirectoryControlCollection contro
response.ResponseName = "1.3.6.1.4.1.1466.20037";
throw new TlsOperationException(response);
}
- else if (LdapErrorMappings.IsLdapError(error))
+
+ if (LdapErrorMappings.IsLdapError(error))
{
string errorMessage = LdapErrorMappings.MapResultCode(error);
throw new LdapException(error, errorMessage);
}
+
+ throw new LdapException(error);
}
}
finally
diff --git a/src/libraries/System.DirectoryServices.Protocols/src/System/DirectoryServices/Protocols/ldap/LocalAppContextSwitches.cs b/src/libraries/System.DirectoryServices.Protocols/src/System/DirectoryServices/Protocols/ldap/LocalAppContextSwitches.cs
new file mode 100644
index 00000000000000..59ddfdf7f10ed3
--- /dev/null
+++ b/src/libraries/System.DirectoryServices.Protocols/src/System/DirectoryServices/Protocols/ldap/LocalAppContextSwitches.cs
@@ -0,0 +1,18 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Runtime.CompilerServices;
+
+namespace System
+{
+ internal static partial class LocalAppContextSwitches
+ {
+ private static int s_useBasicAuthFallback;
+
+ public static bool UseBasicAuthFallback
+ {
+ [MethodImpl(MethodImplOptions.AggressiveInlining)]
+ get => GetCachedSwitchValue("System.DirectoryServices.Protocols.UseBasicAuthFallback", ref s_useBasicAuthFallback);
+ }
+ }
+}
diff --git a/src/libraries/System.DirectoryServices.Protocols/tests/LdapConnectionTests.cs b/src/libraries/System.DirectoryServices.Protocols/tests/LdapConnectionTests.cs
index 9a8074bf5222ad..a0522a61abc182 100644
--- a/src/libraries/System.DirectoryServices.Protocols/tests/LdapConnectionTests.cs
+++ b/src/libraries/System.DirectoryServices.Protocols/tests/LdapConnectionTests.cs
@@ -112,6 +112,16 @@ public void AuthType_SetValid_GetReturnsExpected()
Assert.Equal(AuthType.Basic, connection.AuthType);
}
+ [Fact]
+ public void AuthType_Anonymous_DoesNotThrowNull()
+ {
+ var connection = new LdapConnection("server");
+ connection.AuthType = AuthType.Anonymous;
+ // When calling Bind we make sure that the exception thrown is not that there was a NullReferenceException
+ // trying to retrive a null password's lenght, but instead an LdapException given the server cannot be reached.
+ Assert.Throws(() => connection.Bind());
+ }
+
[Theory]
[InlineData(AuthType.Anonymous - 1)]
[InlineData(AuthType.Kerberos + 1)]
diff --git a/src/libraries/System.DirectoryServices/Directory.Build.props b/src/libraries/System.DirectoryServices/Directory.Build.props
index bfa544ca6f649e..0740890146a71c 100644
--- a/src/libraries/System.DirectoryServices/Directory.Build.props
+++ b/src/libraries/System.DirectoryServices/Directory.Build.props
@@ -5,6 +5,9 @@
plan on shipping a new desktop version out of band. Instead add API
to a different assembly. -->
4.0.0.0
+
+ true
Microsoft
windows
diff --git a/src/libraries/System.DirectoryServices/ref/System.DirectoryServices.csproj b/src/libraries/System.DirectoryServices/ref/System.DirectoryServices.csproj
index a8259f7fffe83c..0da0155f6eaed4 100644
--- a/src/libraries/System.DirectoryServices/ref/System.DirectoryServices.csproj
+++ b/src/libraries/System.DirectoryServices/ref/System.DirectoryServices.csproj
@@ -9,6 +9,7 @@
+
@@ -16,7 +17,6 @@
-
diff --git a/src/libraries/System.DirectoryServices/src/System.DirectoryServices.csproj b/src/libraries/System.DirectoryServices/src/System.DirectoryServices.csproj
index 6cbf2240119c76..41798f7bf3d1d7 100644
--- a/src/libraries/System.DirectoryServices/src/System.DirectoryServices.csproj
+++ b/src/libraries/System.DirectoryServices/src/System.DirectoryServices.csproj
@@ -156,11 +156,11 @@ System.DirectoryServices.ActiveDirectory.DomainController
+
-
@@ -183,7 +183,6 @@ System.DirectoryServices.ActiveDirectory.DomainController
-
diff --git a/src/libraries/System.Drawing.Common/ref/System.Drawing.Common.cs b/src/libraries/System.Drawing.Common/ref/System.Drawing.Common.cs
index 2a6e2a49ef3636..ba1d25352fc237 100644
--- a/src/libraries/System.Drawing.Common/ref/System.Drawing.Common.cs
+++ b/src/libraries/System.Drawing.Common/ref/System.Drawing.Common.cs
@@ -596,12 +596,16 @@ public void Flush(System.Drawing.Drawing2D.FlushIntention intention) { }
public static System.Drawing.Graphics FromImage(System.Drawing.Image image) { throw null; }
[System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
[System.Runtime.Versioning.SupportedOSPlatformAttribute("windows")]
+#if NETCOREAPP3_1_OR_GREATER
[System.ObsoleteAttribute("Use the Graphics.GetContextInfo overloads that accept arguments for better performance and fewer allocations.", DiagnosticId = "SYSLIB0016", UrlFormat = "https://aka.ms/dotnet-warnings/{0}")]
+#endif
public object GetContextInfo() { throw null; }
+#if NETCOREAPP3_1_OR_GREATER
[System.Runtime.Versioning.SupportedOSPlatformAttribute("windows")]
public void GetContextInfo(out PointF offset) { throw null; }
[System.Runtime.Versioning.SupportedOSPlatformAttribute("windows")]
public void GetContextInfo(out PointF offset, out Region? clip) { throw null; }
+#endif
public static System.IntPtr GetHalftonePalette() { throw null; }
public System.IntPtr GetHdc() { throw null; }
public System.Drawing.Color GetNearestColor(System.Drawing.Color color) { throw null; }
diff --git a/src/libraries/System.Drawing.Common/src/CompatibilitySuppressions.xml b/src/libraries/System.Drawing.Common/src/CompatibilitySuppressions.xml
index a7e39a278823c2..a623413023f20d 100644
--- a/src/libraries/System.Drawing.Common/src/CompatibilitySuppressions.xml
+++ b/src/libraries/System.Drawing.Common/src/CompatibilitySuppressions.xml
@@ -2,19 +2,56 @@
CP0001
+ T:System.Drawing.FontConverter
lib/netstandard2.0/System.Drawing.Common.dll
lib/net461/System.Drawing.Common.dll
CP0001
- T:System.Drawing.ColorTranslator
+ T:System.Drawing.IconConverter
lib/netstandard2.0/System.Drawing.Common.dll
- lib/netcoreapp3.1/System.Drawing.Common.dll
+ lib/net461/System.Drawing.Common.dll
+
+
+ CP0001
+ T:System.Drawing.ImageConverter
+ lib/netstandard2.0/System.Drawing.Common.dll
+ lib/net461/System.Drawing.Common.dll
+
+
+ CP0001
+ T:System.Drawing.ImageFormatConverter
+ lib/netstandard2.0/System.Drawing.Common.dll
+ lib/net461/System.Drawing.Common.dll
CP0001
- T:System.Drawing.SystemColors
+ T:System.Drawing.Printing.MarginsConverter
+ lib/netstandard2.0/System.Drawing.Common.dll
+ lib/net461/System.Drawing.Common.dll
+
+
+ CP0002
+ F:System.Drawing.Imaging.Encoder.ColorSpace
+ lib/netstandard2.0/System.Drawing.Common.dll
+ lib/net461/System.Drawing.Common.dll
+
+
+ CP0002
+ F:System.Drawing.Imaging.Encoder.ImageItems
+ lib/netstandard2.0/System.Drawing.Common.dll
+ lib/net461/System.Drawing.Common.dll
+
+
+ CP0002
+ F:System.Drawing.Imaging.Encoder.SaveAsCmyk
lib/netstandard2.0/System.Drawing.Common.dll
- lib/netcoreapp3.1/System.Drawing.Common.dll
+ lib/net461/System.Drawing.Common.dll
+
+
+ CP0002
+ F:System.Drawing.Imaging.EncoderParameterValueType.ValueTypePointer
+ lib/netstandard2.0/System.Drawing.Common.dll
+ lib/net461/System.Drawing.Common.dll
\ No newline at end of file
diff --git a/src/libraries/System.Drawing.Common/src/System/Drawing/GdiplusNative.Windows.cs b/src/libraries/System.Drawing.Common/src/System/Drawing/GdiplusNative.Windows.cs
index 3edf4a0e7b67ec..dbe2888361346e 100644
--- a/src/libraries/System.Drawing.Common/src/System/Drawing/GdiplusNative.Windows.cs
+++ b/src/libraries/System.Drawing.Common/src/System/Drawing/GdiplusNative.Windows.cs
@@ -269,13 +269,13 @@ private static void PlatformInitialize()
[DllImport(LibraryName, ExactSpelling = true)]
internal static extern IntPtr GdipCreateHalftonePalette();
- [DllImport(LibraryName, ExactSpelling = true)]
+ [DllImport(LibraryName, ExactSpelling = true, SetLastError = true)]
internal static extern int GdipDrawBeziers(HandleRef graphics, HandleRef pen, PointF* points, int count);
- [DllImport(LibraryName, ExactSpelling = true)]
+ [DllImport(LibraryName, ExactSpelling = true, SetLastError = true)]
internal static extern int GdipDrawBeziersI(HandleRef graphics, HandleRef pen, Point* points, int count);
- [DllImport(LibraryName, ExactSpelling = true)]
+ [DllImport(LibraryName, ExactSpelling = true, SetLastError = true)]
internal static extern int GdipFillPath(HandleRef graphics, HandleRef brush, HandleRef path);
[DllImport(LibraryName, ExactSpelling = true)]
diff --git a/src/libraries/System.Drawing.Common/src/System/Drawing/GdiplusNative.cs b/src/libraries/System.Drawing.Common/src/System/Drawing/GdiplusNative.cs
index 18619993c0d1d3..c9539e24a38761 100644
--- a/src/libraries/System.Drawing.Common/src/System/Drawing/GdiplusNative.cs
+++ b/src/libraries/System.Drawing.Common/src/System/Drawing/GdiplusNative.cs
@@ -835,7 +835,7 @@ internal static unsafe partial class Gdip
[DllImport(LibraryName, ExactSpelling = true)]
internal static extern int GdipDeleteRegion(HandleRef region);
- [DllImport(LibraryName, ExactSpelling = true)]
+ [DllImport(LibraryName, ExactSpelling = true, SetLastError = true)]
internal static extern int GdipFillRegion(HandleRef graphics, HandleRef brush, HandleRef region);
[DllImport(LibraryName, ExactSpelling = true)]
@@ -1183,127 +1183,127 @@ internal static unsafe partial class Gdip
[DllImport(LibraryName, ExactSpelling = true)]
internal static extern int GdipSaveGraphics(HandleRef graphics, out int state);
- [DllImport(LibraryName, ExactSpelling = true)]
+ [DllImport(LibraryName, ExactSpelling = true, SetLastError = true)]
internal static extern int GdipDrawArc(HandleRef graphics, HandleRef pen, float x, float y, float width, float height, float startAngle, float sweepAngle);
- [DllImport(LibraryName, ExactSpelling = true)]
+ [DllImport(LibraryName, ExactSpelling = true, SetLastError = true)]
internal static extern int GdipDrawArcI(HandleRef graphics, HandleRef pen, int x, int y, int width, int height, float startAngle, float sweepAngle);
- [DllImport(LibraryName, ExactSpelling = true)]
+ [DllImport(LibraryName, ExactSpelling = true, SetLastError = true)]
internal static extern int GdipDrawLinesI(HandleRef graphics, HandleRef pen, Point* points, int count);
- [DllImport(LibraryName, ExactSpelling = true)]
+ [DllImport(LibraryName, ExactSpelling = true, SetLastError = true)]
internal static extern int GdipDrawBezier(HandleRef graphics, HandleRef pen, float x1, float y1, float x2, float y2, float x3, float y3, float x4, float y4);
- [DllImport(LibraryName, ExactSpelling = true)]
+ [DllImport(LibraryName, ExactSpelling = true, SetLastError = true)]
internal static extern int GdipDrawEllipse(HandleRef graphics, HandleRef pen, float x, float y, float width, float height);
- [DllImport(LibraryName, ExactSpelling = true)]
+ [DllImport(LibraryName, ExactSpelling = true, SetLastError = true)]
internal static extern int GdipDrawEllipseI(HandleRef graphics, HandleRef pen, int x, int y, int width, int height);
- [DllImport(LibraryName, ExactSpelling = true)]
+ [DllImport(LibraryName, ExactSpelling = true, SetLastError = true)]
internal static extern int GdipDrawLine(HandleRef graphics, HandleRef pen, float x1, float y1, float x2, float y2);
- [DllImport(LibraryName, ExactSpelling = true)]
+ [DllImport(LibraryName, ExactSpelling = true, SetLastError = true)]
internal static extern int GdipDrawLineI(HandleRef graphics, HandleRef pen, int x1, int y1, int x2, int y2);
- [DllImport(LibraryName, ExactSpelling = true)]
+ [DllImport(LibraryName, ExactSpelling = true, SetLastError = true)]
internal static extern int GdipDrawLines(HandleRef graphics, HandleRef pen, PointF* points, int count);
- [DllImport(LibraryName, ExactSpelling = true)]
+ [DllImport(LibraryName, ExactSpelling = true, SetLastError = true)]
internal static extern int GdipDrawPath(HandleRef graphics, HandleRef pen, HandleRef path);
- [DllImport(LibraryName, ExactSpelling = true)]
+ [DllImport(LibraryName, ExactSpelling = true, SetLastError = true)]
internal static extern int GdipDrawPie(HandleRef graphics, HandleRef pen, float x, float y, float width, float height, float startAngle, float sweepAngle);
- [DllImport(LibraryName, ExactSpelling = true)]
+ [DllImport(LibraryName, ExactSpelling = true, SetLastError = true)]
internal static extern int GdipDrawPieI(HandleRef graphics, HandleRef pen, int x, int y, int width, int height, float startAngle, float sweepAngle);
- [DllImport(LibraryName, ExactSpelling = true)]
+ [DllImport(LibraryName, ExactSpelling = true, SetLastError = true)]
internal static extern int GdipDrawPolygon(HandleRef graphics, HandleRef pen, PointF* points, int count);
- [DllImport(LibraryName, ExactSpelling = true)]
+ [DllImport(LibraryName, ExactSpelling = true, SetLastError = true)]
internal static extern int GdipDrawPolygonI(HandleRef graphics, HandleRef pen, Point* points, int count);
- [DllImport(LibraryName, ExactSpelling = true)]
+ [DllImport(LibraryName, ExactSpelling = true, SetLastError = true)]
internal static extern int GdipFillEllipse(HandleRef graphics, HandleRef brush, float x, float y, float width, float height);
- [DllImport(LibraryName, ExactSpelling = true)]
+ [DllImport(LibraryName, ExactSpelling = true, SetLastError = true)]
internal static extern int GdipFillEllipseI(HandleRef graphics, HandleRef brush, int x, int y, int width, int height);
- [DllImport(LibraryName, ExactSpelling = true)]
+ [DllImport(LibraryName, ExactSpelling = true, SetLastError = true)]
internal static extern int GdipFillPolygon(HandleRef graphics, HandleRef brush, PointF* points, int count, FillMode brushMode);
- [DllImport(LibraryName, ExactSpelling = true)]
+ [DllImport(LibraryName, ExactSpelling = true, SetLastError = true)]
internal static extern int GdipFillPolygonI(HandleRef graphics, HandleRef brush, Point* points, int count, FillMode brushMode);
- [DllImport(LibraryName, ExactSpelling = true)]
+ [DllImport(LibraryName, ExactSpelling = true, SetLastError = true)]
internal static extern int GdipFillRectangle(HandleRef graphics, HandleRef brush, float x, float y, float width, float height);
- [DllImport(LibraryName, ExactSpelling = true)]
+ [DllImport(LibraryName, ExactSpelling = true, SetLastError = true)]
internal static extern int GdipFillRectangleI(HandleRef graphics, HandleRef brush, int x, int y, int width, int height);
- [DllImport(LibraryName, ExactSpelling = true)]
+ [DllImport(LibraryName, ExactSpelling = true, SetLastError = true)]
internal static extern int GdipFillRectangles(HandleRef graphics, HandleRef brush, RectangleF* rects, int count);
- [DllImport(LibraryName, ExactSpelling = true)]
+ [DllImport(LibraryName, ExactSpelling = true, SetLastError = true)]
internal static extern int GdipFillRectanglesI(HandleRef graphics, HandleRef brush, Rectangle* rects, int count);
- [DllImport(LibraryName, ExactSpelling = true, CharSet = CharSet.Unicode)]
+ [DllImport(LibraryName, ExactSpelling = true, CharSet = CharSet.Unicode, SetLastError = true)]
internal static extern int GdipDrawString(HandleRef graphics, string textString, int length, HandleRef font, ref RectangleF layoutRect, HandleRef stringFormat, HandleRef brush);
- [DllImport(LibraryName, ExactSpelling = true)]
+ [DllImport(LibraryName, ExactSpelling = true, SetLastError = true)]
internal static extern int GdipDrawImageRectI(HandleRef graphics, HandleRef image, int x, int y, int width, int height);
[DllImport(LibraryName, ExactSpelling = true)]
internal static extern int GdipGraphicsClear(HandleRef graphics, int argb);
- [DllImport(LibraryName, ExactSpelling = true)]
+ [DllImport(LibraryName, ExactSpelling = true, SetLastError = true)]
internal static extern int GdipDrawClosedCurve(HandleRef graphics, HandleRef pen, PointF* points, int count);
- [DllImport(LibraryName, ExactSpelling = true)]
+ [DllImport(LibraryName, ExactSpelling = true, SetLastError = true)]
internal static extern int GdipDrawClosedCurveI(HandleRef graphics, HandleRef pen, Point* points, int count);
- [DllImport(LibraryName, ExactSpelling = true)]
+ [DllImport(LibraryName, ExactSpelling = true, SetLastError = true)]
internal static extern int GdipDrawClosedCurve2(HandleRef graphics, HandleRef pen, PointF* points, int count, float tension);
- [DllImport(LibraryName, ExactSpelling = true)]
+ [DllImport(LibraryName, ExactSpelling = true, SetLastError = true)]
internal static extern int GdipDrawClosedCurve2I(HandleRef graphics, HandleRef pen, Point* points, int count, float tension);
- [DllImport(LibraryName, ExactSpelling = true)]
+ [DllImport(LibraryName, ExactSpelling = true, SetLastError = true)]
internal static extern int GdipDrawCurve(HandleRef graphics, HandleRef pen, PointF* points, int count);
- [DllImport(LibraryName, ExactSpelling = true)]
+ [DllImport(LibraryName, ExactSpelling = true, SetLastError = true)]
internal static extern int GdipDrawCurveI(HandleRef graphics, HandleRef pen, Point* points, int count);
- [DllImport(LibraryName, ExactSpelling = true)]
+ [DllImport(LibraryName, ExactSpelling = true, SetLastError = true)]
internal static extern int GdipDrawCurve2(HandleRef graphics, HandleRef pen, PointF* points, int count, float tension);
- [DllImport(LibraryName, ExactSpelling = true)]
+ [DllImport(LibraryName, ExactSpelling = true, SetLastError = true)]
internal static extern int GdipDrawCurve2I(HandleRef graphics, HandleRef pen, Point* points, int count, float tension);
- [DllImport(LibraryName, ExactSpelling = true)]
+ [DllImport(LibraryName, ExactSpelling = true, SetLastError = true)]
internal static extern int GdipDrawCurve3(HandleRef graphics, HandleRef pen, PointF* points, int count, int offset, int numberOfSegments, float tension);
- [DllImport(LibraryName, ExactSpelling = true)]
+ [DllImport(LibraryName, ExactSpelling = true, SetLastError = true)]
internal static extern int GdipDrawCurve3I(HandleRef graphics, HandleRef pen, Point* points, int count, int offset, int numberOfSegments, float tension);
- [DllImport(LibraryName, ExactSpelling = true)]
+ [DllImport(LibraryName, ExactSpelling = true, SetLastError = true)]
internal static extern int GdipFillClosedCurve(HandleRef graphics, HandleRef brush, PointF* points, int count);
- [DllImport(LibraryName, ExactSpelling = true)]
+ [DllImport(LibraryName, ExactSpelling = true, SetLastError = true)]
internal static extern int GdipFillClosedCurveI(HandleRef graphics, HandleRef brush, Point* points, int count);
- [DllImport(LibraryName, ExactSpelling = true)]
+ [DllImport(LibraryName, ExactSpelling = true, SetLastError = true)]
internal static extern int GdipFillClosedCurve2(HandleRef graphics, HandleRef brush, PointF* points, int count, float tension, FillMode mode);
- [DllImport(LibraryName, ExactSpelling = true)]
+ [DllImport(LibraryName, ExactSpelling = true, SetLastError = true)]
internal static extern int GdipFillClosedCurve2I(HandleRef graphics, HandleRef brush, Point* points, int count, float tension, FillMode mode);
- [DllImport(LibraryName, ExactSpelling = true)]
+ [DllImport(LibraryName, ExactSpelling = true, SetLastError = true)]
internal static extern int GdipFillPie(HandleRef graphics, HandleRef brush, float x, float y, float width, float height, float startAngle, float sweepAngle);
- [DllImport(LibraryName, ExactSpelling = true)]
+ [DllImport(LibraryName, ExactSpelling = true, SetLastError = true)]
internal static extern int GdipFillPieI(HandleRef graphics, HandleRef brush, int x, int y, int width, int height, float startAngle, float sweepAngle);
[DllImport(LibraryName, ExactSpelling = true, CharSet = CharSet.Unicode)]
@@ -1312,49 +1312,49 @@ internal static unsafe partial class Gdip
[DllImport(LibraryName, ExactSpelling = true, CharSet = CharSet.Unicode)]
internal static extern int GdipMeasureCharacterRanges(HandleRef graphics, string textString, int length, HandleRef font, ref RectangleF layoutRect, HandleRef stringFormat, int characterCount, [In] [Out] IntPtr[] region);
- [DllImport(LibraryName, ExactSpelling = true)]
+ [DllImport(LibraryName, ExactSpelling = true, SetLastError = true)]
internal static extern int GdipDrawImageI(HandleRef graphics, HandleRef image, int x, int y);
- [DllImport(LibraryName, ExactSpelling = true)]
+ [DllImport(LibraryName, ExactSpelling = true, SetLastError = true)]
internal static extern int GdipDrawImage(HandleRef graphics, HandleRef image, float x, float y);
- [DllImport(LibraryName, ExactSpelling = true)]
+ [DllImport(LibraryName, ExactSpelling = true, SetLastError = true)]
internal static extern int GdipDrawImagePoints(HandleRef graphics, HandleRef image, PointF* points, int count);
- [DllImport(LibraryName, ExactSpelling = true)]
+ [DllImport(LibraryName, ExactSpelling = true, SetLastError = true)]
internal static extern int GdipDrawImagePointsI(HandleRef graphics, HandleRef image, Point* points, int count);
- [DllImport(LibraryName, ExactSpelling = true)]
+ [DllImport(LibraryName, ExactSpelling = true, SetLastError = true)]
internal static extern int GdipDrawImageRectRectI(HandleRef graphics, HandleRef image, int dstx, int dsty, int dstwidth, int dstheight, int srcx, int srcy, int srcwidth, int srcheight, GraphicsUnit srcunit, HandleRef imageAttributes, Graphics.DrawImageAbort? callback, HandleRef callbackdata);
- [DllImport(LibraryName, ExactSpelling = true)]
+ [DllImport(LibraryName, ExactSpelling = true, SetLastError = true)]
internal static extern int GdipDrawImagePointsRect(HandleRef graphics, HandleRef image, PointF* points, int count, float srcx, float srcy, float srcwidth, float srcheight, GraphicsUnit srcunit, HandleRef imageAttributes, Graphics.DrawImageAbort? callback, HandleRef callbackdata);
- [DllImport(LibraryName, ExactSpelling = true)]
+ [DllImport(LibraryName, ExactSpelling = true, SetLastError = true)]
internal static extern int GdipDrawImageRectRect(HandleRef graphics, HandleRef image, float dstx, float dsty, float dstwidth, float dstheight, float srcx, float srcy, float srcwidth, float srcheight, GraphicsUnit srcunit, HandleRef imageAttributes, Graphics.DrawImageAbort? callback, HandleRef callbackdata);
- [DllImport(LibraryName, ExactSpelling = true)]
+ [DllImport(LibraryName, ExactSpelling = true, SetLastError = true)]
internal static extern int GdipDrawImagePointsRectI(HandleRef graphics, HandleRef image, Point* points, int count, int srcx, int srcy, int srcwidth, int srcheight, GraphicsUnit srcunit, HandleRef imageAttributes, Graphics.DrawImageAbort? callback, HandleRef callbackdata);
- [DllImport(LibraryName, ExactSpelling = true)]
+ [DllImport(LibraryName, ExactSpelling = true, SetLastError = true)]
internal static extern int GdipDrawImageRect(HandleRef graphics, HandleRef image, float x, float y, float width, float height);
- [DllImport(LibraryName, ExactSpelling = true)]
+ [DllImport(LibraryName, ExactSpelling = true, SetLastError = true)]
internal static extern int GdipDrawImagePointRect(HandleRef graphics, HandleRef image, float x, float y, float srcx, float srcy, float srcwidth, float srcheight, int srcunit);
- [DllImport(LibraryName, ExactSpelling = true)]
+ [DllImport(LibraryName, ExactSpelling = true, SetLastError = true)]
internal static extern int GdipDrawImagePointRectI(HandleRef graphics, HandleRef image, int x, int y, int srcx, int srcy, int srcwidth, int srcheight, int srcunit);
- [DllImport(LibraryName, ExactSpelling = true)]
+ [DllImport(LibraryName, ExactSpelling = true, SetLastError = true)]
internal static extern int GdipDrawRectangle(HandleRef graphics, HandleRef pen, float x, float y, float width, float height);
- [DllImport(LibraryName, ExactSpelling = true)]
+ [DllImport(LibraryName, ExactSpelling = true, SetLastError = true)]
internal static extern int GdipDrawRectangleI(HandleRef graphics, HandleRef pen, int x, int y, int width, int height);
- [DllImport(LibraryName, ExactSpelling = true)]
+ [DllImport(LibraryName, ExactSpelling = true, SetLastError = true)]
internal static extern int GdipDrawRectangles(HandleRef graphics, HandleRef pen, RectangleF* rects, int count);
- [DllImport(LibraryName, ExactSpelling = true)]
+ [DllImport(LibraryName, ExactSpelling = true, SetLastError = true)]
internal static extern int GdipDrawRectanglesI(HandleRef graphics, HandleRef pen, Rectangle* rects, int count);
[DllImport(LibraryName, ExactSpelling = true)]
diff --git a/src/libraries/System.Drawing.Common/src/System/Drawing/Graphics.Unix.cs b/src/libraries/System.Drawing.Common/src/System/Drawing/Graphics.Unix.cs
index cba7e4aab0a55e..4baa41dad24499 100644
--- a/src/libraries/System.Drawing.Common/src/System/Drawing/Graphics.Unix.cs
+++ b/src/libraries/System.Drawing.Common/src/System/Drawing/Graphics.Unix.cs
@@ -583,6 +583,7 @@ public object GetContextInfo()
throw new NotImplementedException();
}
+#if NETCOREAPP3_1_OR_GREATER
[EditorBrowsable(EditorBrowsableState.Never)]
[SupportedOSPlatform("windows")]
public void GetContextInfo(out PointF offset)
@@ -596,6 +597,7 @@ public void GetContextInfo(out PointF offset, out Region? clip)
{
throw new PlatformNotSupportedException();
}
+#endif
private void CheckErrorStatus(int status)
{
diff --git a/src/libraries/System.Drawing.Common/src/System/Drawing/Graphics.Windows.cs b/src/libraries/System.Drawing.Common/src/System/Drawing/Graphics.Windows.cs
index 8dd2ad15b22d52..475e35a176ceac 100644
--- a/src/libraries/System.Drawing.Common/src/System/Drawing/Graphics.Windows.cs
+++ b/src/libraries/System.Drawing.Common/src/System/Drawing/Graphics.Windows.cs
@@ -684,7 +684,9 @@ public unsafe void EnumerateMetafile(
/// WARNING: This method is for internal FX support only.
///
[EditorBrowsable(EditorBrowsableState.Never)]
+#if NETCOREAPP3_1_OR_GREATER
[Obsolete(Obsoletions.GetContextInfoMessage, DiagnosticId = Obsoletions.GetContextInfoDiagId, UrlFormat = Obsoletions.SharedUrlFormat)]
+#endif
[SupportedOSPlatform("windows")]
public object GetContextInfo()
{
@@ -763,6 +765,7 @@ private void GetContextInfo(out Matrix3x2 cumulativeTransform, bool calculateCli
}
}
+#if NETCOREAPP3_1_OR_GREATER
///
/// Gets the cumulative offset.
///
@@ -789,6 +792,7 @@ public void GetContextInfo(out PointF offset, out Region? clip)
Vector2 translation = cumulativeTransform.Translation;
offset = new PointF(translation.X, translation.Y);
}
+#endif
public RectangleF VisibleClipBounds
{
diff --git a/src/libraries/System.Drawing.Common/src/misc/GDI/WindowsGraphics.cs b/src/libraries/System.Drawing.Common/src/misc/GDI/WindowsGraphics.cs
index 6257a8219199b0..1322bd6e81d08b 100644
--- a/src/libraries/System.Drawing.Common/src/misc/GDI/WindowsGraphics.cs
+++ b/src/libraries/System.Drawing.Common/src/misc/GDI/WindowsGraphics.cs
@@ -61,6 +61,7 @@ public static WindowsGraphics FromGraphics(Graphics g, ApplyGraphicsProperties p
{
Region? clip = null;
+#if NETCOREAPP3_1_OR_GREATER
if (properties.HasFlag(ApplyGraphicsProperties.Clipping))
{
g.GetContextInfo(out offset, out clip);
@@ -69,6 +70,21 @@ public static WindowsGraphics FromGraphics(Graphics g, ApplyGraphicsProperties p
{
g.GetContextInfo(out offset);
}
+#else
+ Matrix? worldTransf = null;
+ if (g.GetContextInfo() is object[] data && data.Length == 2)
+ {
+ if (properties.HasFlag(ApplyGraphicsProperties.Clipping))
+ {
+ clip = data[0] as Region;
+ }
+ worldTransf = data[1] as Matrix;
+ if (worldTransf != null)
+ {
+ offset = worldTransf.Offset;
+ }
+ }
+#endif
if (clip is not null)
{
diff --git a/src/libraries/System.Drawing.Common/tests/PenTests.cs b/src/libraries/System.Drawing.Common/tests/PenTests.cs
index 3b413bc0f0b9dd..b5f39c4483855c 100644
--- a/src/libraries/System.Drawing.Common/tests/PenTests.cs
+++ b/src/libraries/System.Drawing.Common/tests/PenTests.cs
@@ -46,6 +46,7 @@ public static IEnumerable Ctor_Brush_Width_TestData()
yield return new object[] { new SolidBrush(Color.Red), float.MaxValue, PenType.SolidColor };
}
+ [ActiveIssue("https://github.com/dotnet/runtime/issues/60731", TestPlatforms.Windows)]
[ConditionalTheory(Helpers.IsDrawingSupported)]
[MemberData(nameof(Ctor_Brush_Width_TestData))]
public void Ctor_Brush_Width(T brush, float width, PenType expectedPenType) where T : Brush
@@ -96,6 +97,7 @@ public void Ctor_Color()
}
}
+ [ActiveIssue("https://github.com/dotnet/runtime/issues/60731", TestPlatforms.Windows)]
[ConditionalTheory(Helpers.IsDrawingSupported)]
[InlineData(-1)]
[InlineData(0)]
diff --git a/src/libraries/System.Dynamic.Runtime/tests/Dynamic.DynamicType/Conformance.dynamic.dynamicType.basic.cs b/src/libraries/System.Dynamic.Runtime/tests/Dynamic.DynamicType/Conformance.dynamic.dynamicType.basic.cs
index 480f6200208d30..9c4eb3000ae8b6 100644
--- a/src/libraries/System.Dynamic.Runtime/tests/Dynamic.DynamicType/Conformance.dynamic.dynamicType.basic.cs
+++ b/src/libraries/System.Dynamic.Runtime/tests/Dynamic.DynamicType/Conformance.dynamic.dynamicType.basic.cs
@@ -3392,7 +3392,7 @@ public static int MainMethod(string[] args)
}
;
- if (d.GetType() != typeof(dynamic[]))
+ if (d.GetType() != typeof(object[]))
return 1;
return 0;
}
@@ -3420,7 +3420,7 @@ public static int MainMethod(string[] args)
}
;
- if (d.GetType() != typeof(dynamic[]))
+ if (d.GetType() != typeof(object[]))
return 1;
return 0;
}
@@ -3456,7 +3456,7 @@ public static int MainMethod(string[] args)
}
;
- if (d.GetType() != typeof(dynamic[]))
+ if (d.GetType() != typeof(object[]))
return 1;
return 0;
}
diff --git a/src/libraries/System.Globalization/tests/CultureInfo/CultureInfoAll.cs b/src/libraries/System.Globalization/tests/CultureInfo/CultureInfoAll.cs
index c89088b7119b6d..dac3b98dc2cea9 100644
--- a/src/libraries/System.Globalization/tests/CultureInfo/CultureInfoAll.cs
+++ b/src/libraries/System.Globalization/tests/CultureInfo/CultureInfoAll.cs
@@ -667,12 +667,6 @@ public void LcidTest(int lcid, string[] cultureNames, string specificCultureName
CultureInfo ci = new CultureInfo(lcid);
Assert.Contains(ci.Name, cultureNames, StringComparer.OrdinalIgnoreCase);
- if (ci.LCID == 0x1000)
- {
- // Unsupported culture.
- return;
- }
-
Assert.True(lcid == ci.LCID || (ushort)lcid == (ushort)ci.LCID);
Assert.True(ci.UseUserOverride, "UseUserOverride for lcid created culture expected to be true");
Assert.False(ci.IsReadOnly, "IsReadOnly for lcid created culture expected to be false");
@@ -719,10 +713,14 @@ public void LcidTest(int lcid, string[] cultureNames, string specificCultureName
ci = CultureInfo.CreateSpecificCulture(cultureNames[0]);
TestCultureName(specificCultureName, ci.Name);
- ci = CultureInfo.GetCultureInfoByIetfLanguageTag(cultureNames[0]);
- Assert.Contains(ci.Name, cultureNames, StringComparer.OrdinalIgnoreCase);
- TestCultureName(ci.Name, ci.IetfLanguageTag);
- Assert.True(lcid == ci.KeyboardLayoutId || (ushort)lcid == (ushort)ci.KeyboardLayoutId);
+ // CultureInfo.GetCultureInfoByIetfLanguageTag doesn't support alternative sort LCID's.
+ if (lcid <= 0xffff && lcid != 0x040a)
+ {
+ ci = CultureInfo.GetCultureInfoByIetfLanguageTag(cultureNames[0]);
+ Assert.Contains(ci.Name, cultureNames, StringComparer.OrdinalIgnoreCase);
+ TestCultureName(ci.Name, ci.IetfLanguageTag);
+ Assert.True(lcid == ci.KeyboardLayoutId || (ushort)lcid == (ushort)ci.KeyboardLayoutId);
+ }
if (ci.GetConsoleFallbackUICulture().Name != "")
{
@@ -733,8 +731,8 @@ public void LcidTest(int lcid, string[] cultureNames, string specificCultureName
{
AssertExtensions.Throws(() => new CultureInfo(lcid));
}
-
- }
+
+ }
private static string[] hans = new[] { "zh-CN", "zh-CHS", "zh-Hans" };
private static string[] hant = new[] { "zh-HK", "zh-CHT", "zh-Hant" };
diff --git a/src/libraries/System.Globalization/tests/CultureInfo/GetCultureInfo.cs b/src/libraries/System.Globalization/tests/CultureInfo/GetCultureInfo.cs
index e6399bb5cc6177..5a5e3dada218b1 100644
--- a/src/libraries/System.Globalization/tests/CultureInfo/GetCultureInfo.cs
+++ b/src/libraries/System.Globalization/tests/CultureInfo/GetCultureInfo.cs
@@ -32,12 +32,15 @@ public static IEnumerable GetCultureInfoTestData()
if (PlatformDetection.IsIcuGlobalization)
{
- yield return new object[] { "x\u0000X-Yy", "x" }; // Null byte
+ if (PlatformDetection.IsNotWindows)
+ {
+ yield return new object[] { "x\u0000X-Yy", "x" }; // Null byte
+ yield return new object[] { "zh-cmn", "zh-CMN" };
+ yield return new object[] { "zh-CMN-HANS" };
+ yield return new object[] { "zh-cmn-Hant", "zh-CMN-HANT" };
+ }
yield return new object[] { "sgn-BE-FR" };
yield return new object[] { "zh-min-nan", "nan" };
- yield return new object[] { "zh-cmn", "zh-CMN" };
- yield return new object[] { "zh-CMN-HANS" };
- yield return new object[] { "zh-cmn-Hant", "zh-CMN-HANT" };
yield return new object[] { "zh-gan", "gan" };
yield return new object[] { "zh-Hans-CN" };
yield return new object[] { "zh-Hans-SG" };
@@ -58,6 +61,17 @@ public static IEnumerable GetCultureInfoTestData()
}
}
+ [Theory]
+ [PlatformSpecific(TestPlatforms.Windows)] // Windows specific behavior
+ [InlineData("x\u0000X-Yy")]
+ [InlineData("zh-cmn")]
+ [InlineData("zh-CMN-HANS")]
+ [InlineData("zh-cmn-Hant")]
+ public void TestIvalidCultureNames(string cultureName)
+ {
+ Assert.Throws(() => new CultureInfo(cultureName));
+ }
+
[ConditionalTheory(nameof(PlatformSupportsFakeCulture))]
[MemberData(nameof(GetCultureInfoTestData))]
public void GetCultureInfo(string name, string expected = null)
diff --git a/src/libraries/System.Globalization/tests/IcuTests.cs b/src/libraries/System.Globalization/tests/IcuTests.cs
index 190da7f676c807..e28872759bea7f 100644
--- a/src/libraries/System.Globalization/tests/IcuTests.cs
+++ b/src/libraries/System.Globalization/tests/IcuTests.cs
@@ -10,7 +10,9 @@ namespace System.Globalization.Tests
public class IcuTests
{
private static bool IsIcuCompatiblePlatform => PlatformDetection.IsNotWindows ||
- PlatformDetection.IsWindows10Version1903OrGreater;
+ PlatformDetection.IsWindows10Version1903OrGreater &&
+ // Server core doesn't have icu.dll on SysWOW64
+ !(PlatformDetection.IsWindowsServerCore && PlatformDetection.IsX86Process);
[ConditionalFact(nameof(IsIcuCompatiblePlatform))]
public static void IcuShouldBeUsedByDefault()
diff --git a/src/libraries/System.Globalization/tests/System/Globalization/TextInfoTests.cs b/src/libraries/System.Globalization/tests/System/Globalization/TextInfoTests.cs
index eae275bc0b1a3e..c36ba960230ce6 100644
--- a/src/libraries/System.Globalization/tests/System/Globalization/TextInfoTests.cs
+++ b/src/libraries/System.Globalization/tests/System/Globalization/TextInfoTests.cs
@@ -287,7 +287,7 @@ public static IEnumerable ToLower_TestData()
}
yield return new object[] { cultureName, "\u0130", "i" };
yield return new object[] { cultureName, "i", "i" };
-
+
}
// ICU has special tailoring for the en-US-POSIX locale which treats "i" and "I" as different letters
@@ -478,5 +478,13 @@ public void ToStringTest(string name, string expected)
{
Assert.Equal(expected, new CultureInfo(name).TextInfo.ToString());
}
+
+ [ConditionalTheory(typeof(PlatformDetection), nameof(PlatformDetection.IsNotBrowser))]
+ [InlineData("es-ES")]
+ [InlineData("es-ES_tradnl")]
+ public void TestAsciiCodePageWithCulturesWithAlternativeSortNames(string cultureName)
+ {
+ Assert.Equal(1252, CultureInfo.GetCultureInfo(cultureName).TextInfo.ANSICodePage);
+ }
}
}
diff --git a/src/libraries/System.IO.Compression.ZipFile/src/System/IO/Compression/ZipFileExtensions.ZipArchiveEntry.Extract.cs b/src/libraries/System.IO.Compression.ZipFile/src/System/IO/Compression/ZipFileExtensions.ZipArchiveEntry.Extract.cs
index 5d800c1f62ca71..fe725937441e24 100644
--- a/src/libraries/System.IO.Compression.ZipFile/src/System/IO/Compression/ZipFileExtensions.ZipArchiveEntry.Extract.cs
+++ b/src/libraries/System.IO.Compression.ZipFile/src/System/IO/Compression/ZipFileExtensions.ZipArchiveEntry.Extract.cs
@@ -83,7 +83,7 @@ public static void ExtractToFile(this ZipArchiveEntry source, string destination
{
File.SetLastWriteTime(destinationFileName, source.LastWriteTime.DateTime);
}
- catch (UnauthorizedAccessException)
+ catch
{
// some OSes like Android (#35374) might not support setting the last write time, the extraction should not fail because of that
}
diff --git a/src/libraries/System.IO.FileSystem.Watcher/Directory.Build.props b/src/libraries/System.IO.FileSystem.Watcher/Directory.Build.props
index ce244cbea56199..c581a9ef9e5a84 100644
--- a/src/libraries/System.IO.FileSystem.Watcher/Directory.Build.props
+++ b/src/libraries/System.IO.FileSystem.Watcher/Directory.Build.props
@@ -3,6 +3,7 @@
Microsoft
true
- browser
+ browser;ios;tvos
+ maccatalyst
\ No newline at end of file
diff --git a/src/libraries/System.IO.FileSystem.Watcher/src/System.IO.FileSystem.Watcher.csproj b/src/libraries/System.IO.FileSystem.Watcher/src/System.IO.FileSystem.Watcher.csproj
index b6b0579e63026f..056431aa17e502 100644
--- a/src/libraries/System.IO.FileSystem.Watcher/src/System.IO.FileSystem.Watcher.csproj
+++ b/src/libraries/System.IO.FileSystem.Watcher/src/System.IO.FileSystem.Watcher.csproj
@@ -1,7 +1,7 @@
true
- $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Linux;$(NetCoreAppCurrent);$(NetCoreAppCurrent)-OSX;$(NetCoreAppCurrent)-iOS;$(NetCoreAppCurrent)-tvOS;$(NetCoreAppCurrent)-FreeBSD
+ $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Linux;$(NetCoreAppCurrent);$(NetCoreAppCurrent)-OSX;$(NetCoreAppCurrent)-MacCatalyst;$(NetCoreAppCurrent)-FreeBSD
enable
@@ -75,7 +75,7 @@
-
+
diff --git a/src/libraries/System.IO.FileSystem.Watcher/tests/AssemblyInfo.cs b/src/libraries/System.IO.FileSystem.Watcher/tests/AssemblyInfo.cs
index 94b42c5041cc9f..9659dd75903a73 100644
--- a/src/libraries/System.IO.FileSystem.Watcher/tests/AssemblyInfo.cs
+++ b/src/libraries/System.IO.FileSystem.Watcher/tests/AssemblyInfo.cs
@@ -4,4 +4,4 @@
using System;
using Xunit;
-[assembly: SkipOnPlatform(TestPlatforms.Browser, "System.IO.FileSystem.Watcher is not supported on Browser")]
+[assembly: SkipOnPlatform(TestPlatforms.Browser | TestPlatforms.iOS | TestPlatforms.tvOS, "System.IO.FileSystem.Watcher is not supported on Browser/iOS/tvOS")]
diff --git a/src/libraries/System.IO.FileSystem.Watcher/tests/FileSystemWatcher.WaitForChanged.cs b/src/libraries/System.IO.FileSystem.Watcher/tests/FileSystemWatcher.WaitForChanged.cs
index aec8019cdceb9d..cce5f54469f2dd 100644
--- a/src/libraries/System.IO.FileSystem.Watcher/tests/FileSystemWatcher.WaitForChanged.cs
+++ b/src/libraries/System.IO.FileSystem.Watcher/tests/FileSystemWatcher.WaitForChanged.cs
@@ -111,6 +111,7 @@ public void NonZeroTimeout_NoEvents_TimesOut(bool enabledBeforeWait)
[InlineData(WatcherChangeTypes.Changed, false)]
[InlineData(WatcherChangeTypes.Renamed, true)]
[InlineData(WatcherChangeTypes.All, true)]
+ [ActiveIssue("https://github.com/dotnet/runtime/issues/58418", typeof(PlatformDetection), nameof(PlatformDetection.IsMacCatalyst), nameof(PlatformDetection.IsArm64Process))]
public void NonZeroTimeout_NoActivity_TimesOut(WatcherChangeTypes changeType, bool enabledBeforeWait)
{
using (var testDirectory = new TempDirectory(GetTestFilePath()))
diff --git a/src/libraries/System.IO.FileSystem.Watcher/tests/System.IO.FileSystem.Watcher.Tests.csproj b/src/libraries/System.IO.FileSystem.Watcher/tests/System.IO.FileSystem.Watcher.Tests.csproj
index 67c502fa83412a..1139f2ecf2a0cd 100644
--- a/src/libraries/System.IO.FileSystem.Watcher/tests/System.IO.FileSystem.Watcher.Tests.csproj
+++ b/src/libraries/System.IO.FileSystem.Watcher/tests/System.IO.FileSystem.Watcher.Tests.csproj
@@ -1,8 +1,8 @@
true
- $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Linux;$(NetCoreAppCurrent)-OSX;$(NetCoreAppCurrent)-iOS;$(NetCoreAppCurrent)-tvOS;$(NetCoreAppCurrent)-FreeBSD
- true
+ $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Linux;$(NetCoreAppCurrent)-OSX;$(NetCoreAppCurrent)-MacCatalyst;$(NetCoreAppCurrent)-FreeBSD
+ true
diff --git a/src/libraries/System.IO.FileSystem/tests/Base/BaseGetSetTimes.cs b/src/libraries/System.IO.FileSystem/tests/Base/BaseGetSetTimes.cs
index a959e317682f4e..d55171847a0b7d 100644
--- a/src/libraries/System.IO.FileSystem/tests/Base/BaseGetSetTimes.cs
+++ b/src/libraries/System.IO.FileSystem/tests/Base/BaseGetSetTimes.cs
@@ -20,7 +20,9 @@ public abstract class BaseGetSetTimes : FileSystemTest
protected static bool LowTemporalResolution => PlatformDetection.IsBrowser || isHFS;
protected static bool HighTemporalResolution => !LowTemporalResolution;
- protected abstract T GetExistingItem();
+ protected abstract bool CanBeReadOnly { get; }
+
+ protected abstract T GetExistingItem(bool readOnly = false);
protected abstract T GetMissingItem();
protected abstract string GetItemPath(T item);
@@ -42,11 +44,8 @@ public static TimeFunction Create(SetTime setter, GetTime getter, DateTimeKind k
public DateTimeKind Kind => Item3;
}
- [Fact]
- public void SettingUpdatesProperties()
+ private void SettingUpdatesPropertiesCore(T item)
{
- T item = GetExistingItem();
-
Assert.All(TimeFunctions(requiresRoundtripping: true), (function) =>
{
// Checking that milliseconds are not dropped after setter.
@@ -70,6 +69,25 @@ public void SettingUpdatesProperties()
});
}
+ [Fact]
+ public void SettingUpdatesProperties()
+ {
+ T item = GetExistingItem();
+ SettingUpdatesPropertiesCore(item);
+ }
+
+ [Fact]
+ public void SettingUpdatesPropertiesWhenReadOnly()
+ {
+ if (!CanBeReadOnly)
+ {
+ return; // directories can't be read only, so automatic pass
+ }
+
+ T item = GetExistingItem(readOnly: true);
+ SettingUpdatesPropertiesCore(item);
+ }
+
[Fact]
public void CanGetAllTimesAfterCreation()
{
diff --git a/src/libraries/System.IO.FileSystem/tests/Base/SymbolicLinks/BaseSymbolicLinks.FileSystem.cs b/src/libraries/System.IO.FileSystem/tests/Base/SymbolicLinks/BaseSymbolicLinks.FileSystem.cs
index 0682f8ce16e5bb..ffecf938cb3df3 100644
--- a/src/libraries/System.IO.FileSystem/tests/Base/SymbolicLinks/BaseSymbolicLinks.FileSystem.cs
+++ b/src/libraries/System.IO.FileSystem/tests/Base/SymbolicLinks/BaseSymbolicLinks.FileSystem.cs
@@ -1,7 +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.Collections.Generic;
+using System.IO.Enumeration;
+using System.Linq;
using Xunit;
namespace System.IO.Tests
@@ -156,7 +157,7 @@ public void ResolveLinkTarget_ReturnsNull_NotALink(bool returnFinalTarget)
}
[Theory]
- [MemberData(nameof(ResolveLinkTarget_PathToTarget_Data))]
+ [MemberData(nameof(SymbolicLink_ResolveLinkTarget_PathToTarget_Data))]
public void ResolveLinkTarget_Succeeds(string pathToTarget, bool returnFinalTarget)
{
string linkPath = GetRandomLinkPath();
@@ -342,32 +343,6 @@ public void DetectLinkReferenceToSelf()
Assert.Throws(() => ResolveLinkTarget(linkPath, returnFinalTarget: true));
}
- [Fact]
- public void CreateSymbolicLink_WrongTargetType_Throws()
- {
- // dirLink -> file
- // fileLink -> dir
-
- string targetPath = GetRandomFilePath();
- CreateFileOrDirectory(targetPath, createOpposite: true); // The underlying file system entry needs to be different
- Assert.Throws(() => CreateSymbolicLink(GetRandomFilePath(), targetPath));
- }
-
- [Fact]
- public void CreateSymbolicLink_WrongTargetType_Indirect_Throws()
- {
- // link-2 (dir) -> link-1 (file) -> file
- // link-2 (file) -> link-1 (dir) -> dir
- string targetPath = GetRandomFilePath();
- string firstLinkPath = GetRandomFilePath();
- string secondLinkPath = GetRandomFilePath();
-
- CreateFileOrDirectory(targetPath, createOpposite: true);
- CreateSymbolicLink_Opposite(firstLinkPath, targetPath);
-
- Assert.Throws(() => CreateSymbolicLink(secondLinkPath, firstLinkPath));
- }
-
[Fact]
public void CreateSymbolicLink_CorrectTargetType_Indirect_Succeeds()
{
@@ -427,14 +402,14 @@ private void ResolveLinkTarget_ReturnFinalTarget(string link1Path, string link1T
Assert.True(link2Info.Exists);
Assert.True(link2Info.Attributes.HasFlag(FileAttributes.ReparsePoint));
AssertIsCorrectTypeAndDirectoryAttribute(link2Info);
- Assert.Equal(link2Target, link2Info.LinkTarget);
+ AssertPathEquals_RelativeSegments(link2Target, link2Info.LinkTarget);
// link1 to link2
FileSystemInfo link1Info = CreateSymbolicLink(link1Path, link1Target);
Assert.True(link1Info.Exists);
Assert.True(link1Info.Attributes.HasFlag(FileAttributes.ReparsePoint));
AssertIsCorrectTypeAndDirectoryAttribute(link1Info);
- Assert.Equal(link1Target, link1Info.LinkTarget);
+ AssertPathEquals_RelativeSegments(link1Target, link1Info.LinkTarget);
// link1: do not follow symlinks
FileSystemInfo link1TargetInfo = ResolveLinkTarget(link1Path, returnFinalTarget: false);
@@ -442,7 +417,7 @@ private void ResolveLinkTarget_ReturnFinalTarget(string link1Path, string link1T
AssertIsCorrectTypeAndDirectoryAttribute(link1TargetInfo);
Assert.True(link1TargetInfo.Attributes.HasFlag(FileAttributes.ReparsePoint));
Assert.Equal(link2Path, link1TargetInfo.FullName);
- Assert.Equal(link2Target, link1TargetInfo.LinkTarget);
+ AssertPathEquals_RelativeSegments(link2Target, link1TargetInfo.LinkTarget);
// link2: do not follow symlinks
FileSystemInfo link2TargetInfo = ResolveLinkTarget(link2Path, returnFinalTarget: false);
@@ -458,13 +433,25 @@ private void ResolveLinkTarget_ReturnFinalTarget(string link1Path, string link1T
AssertIsCorrectTypeAndDirectoryAttribute(finalTarget);
Assert.False(finalTarget.Attributes.HasFlag(FileAttributes.ReparsePoint));
Assert.Equal(filePath, finalTarget.FullName);
+
+ void AssertPathEquals_RelativeSegments(string expected, string actual)
+ {
+#if WINDOWS
+ // DeviceIoControl canonicalizes the target path i.e: removes redundant segments.
+ int rootLength = PathInternal.GetRootLength(expected);
+ if (rootLength > 0)
+ {
+ expected = PathInternal.RemoveRelativeSegments(expected, rootLength);
+ }
+#endif
+ Assert.Equal(expected, actual);
+ }
}
+ // Must call inside a remote executor
protected void CreateSymbolicLink_PathToTarget_RelativeToLinkPath_Internal(bool createOpposite)
{
- string tempCwd = GetRandomDirPath();
- Directory.CreateDirectory(tempCwd);
- Directory.SetCurrentDirectory(tempCwd);
+ string tempCwd = ChangeCurrentDirectory();
// Create a dummy file or directory in cwd.
string fileOrDirectoryInCwd = GetRandomFileName();
@@ -483,49 +470,32 @@ protected void CreateSymbolicLink_PathToTarget_RelativeToLinkPath_Internal(bool
Assert.Equal(Path.GetDirectoryName(linkInfo.FullName), Path.GetDirectoryName(targetInfo.FullName));
}
- public static IEnumerable ResolveLinkTarget_PathToTarget_Data
+ protected static string? GetAppExecLinkPath()
{
- get
+ string localAppDataPath = Environment.GetEnvironmentVariable("LOCALAPPDATA");
+ if (localAppDataPath is null)
{
- foreach (string path in PathToTargetData)
- {
- yield return new object[] { path, false };
- yield return new object[] { path, true };
- }
+ return null;
}
- }
- internal static IEnumerable PathToTargetData
- {
- get
+ string windowsAppsDir = Path.Join(localAppDataPath, "Microsoft", "WindowsApps");
+
+ if (!Directory.Exists(windowsAppsDir))
{
- if (OperatingSystem.IsWindows())
- {
- //Non-rooted relative
- yield return "foo";
- yield return @".\foo";
- yield return @"..\foo";
- // Rooted relative
- yield return @"\foo";
- // Rooted absolute
- yield return Path.Combine(Path.GetTempPath(), "foo");
- // Extended DOS
- yield return Path.Combine(@"\\?\", Path.GetTempPath(), "foo");
- // UNC
- yield return @"\\LOCALHOST\share\path";
- }
- else
- {
- //Non-rooted relative
- yield return "foo";
- yield return "./foo";
- yield return "../foo";
- // Rooted relative
- yield return "/foo";
- // Rooted absolute
- Path.Combine(Path.GetTempPath(), "foo");
- }
+ return null;
}
+
+ var opts = new EnumerationOptions { RecurseSubdirectories = true };
+
+ return new FileSystemEnumerable(
+ windowsAppsDir,
+ (ref FileSystemEntry entry) => entry.ToFullPath(),
+ opts)
+ {
+ ShouldIncludePredicate = (ref FileSystemEntry entry) =>
+ FileSystemName.MatchesWin32Expression("*.exe", entry.FileName) &&
+ (entry.Attributes & FileAttributes.ReparsePoint) != 0
+ }.FirstOrDefault();
}
}
}
diff --git a/src/libraries/System.IO.FileSystem/tests/Base/SymbolicLinks/BaseSymbolicLinks.FileSystemInfo.cs b/src/libraries/System.IO.FileSystem/tests/Base/SymbolicLinks/BaseSymbolicLinks.FileSystemInfo.cs
index e82864248eb434..05e18f14e9ecf2 100644
--- a/src/libraries/System.IO.FileSystem/tests/Base/SymbolicLinks/BaseSymbolicLinks.FileSystemInfo.cs
+++ b/src/libraries/System.IO.FileSystem/tests/Base/SymbolicLinks/BaseSymbolicLinks.FileSystemInfo.cs
@@ -1,8 +1,6 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
-using System.Collections.Generic;
-using System.Diagnostics;
using Xunit;
namespace System.IO.Tests
@@ -54,7 +52,7 @@ public void LinkTarget_ReturnsNull_NotALink()
}
[Theory]
- [MemberData(nameof(LinkTarget_PathToTarget_Data))]
+ [MemberData(nameof(SymbolicLink_LinkTarget_PathToTarget_Data))]
public void LinkTarget_Succeeds(string pathToTarget)
{
FileSystemInfo linkInfo = CreateSymbolicLink(GetRandomLinkPath(), pathToTarget);
@@ -86,16 +84,5 @@ public void LinkTarget_RefreshesCorrectly()
Assert.Equal(newPathToTarget, linkInfo.LinkTarget);
Assert.Equal(newLinkInfo.LinkTarget, linkInfo.LinkTarget);
}
-
- public static IEnumerable LinkTarget_PathToTarget_Data
- {
- get
- {
- foreach (string path in PathToTargetData)
- {
- yield return new object[] { path };
- }
- }
- }
}
}
diff --git a/src/libraries/System.IO.FileSystem/tests/Base/SymbolicLinks/BaseSymbolicLinks.cs b/src/libraries/System.IO.FileSystem/tests/Base/SymbolicLinks/BaseSymbolicLinks.cs
index f120cdf10eba53..d506e7e5e9b2b2 100644
--- a/src/libraries/System.IO.FileSystem/tests/Base/SymbolicLinks/BaseSymbolicLinks.cs
+++ b/src/libraries/System.IO.FileSystem/tests/Base/SymbolicLinks/BaseSymbolicLinks.cs
@@ -1,10 +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.Buffers;
-using System.Diagnostics;
-using System.Runtime.InteropServices;
-using Microsoft.Win32.SafeHandles;
+using System.Collections.Generic;
+using System.Linq;
using Xunit;
namespace System.IO.Tests
@@ -36,5 +34,108 @@ protected DirectoryInfo CreateSelfReferencingSymbolicLink()
protected string GetRandomDirPath() => Path.Join(ActualTestDirectory.Value, GetRandomDirName());
private Lazy ActualTestDirectory => new Lazy(() => GetTestDirectoryActualCasing());
+
+ ///
+ /// Changes the current working directory path to a new temporary directory.
+ /// Important: Make sure to call this inside a remote executor to avoid changing the cwd for all tests in same process.
+ ///
+ /// The path of the new cwd.
+ protected string ChangeCurrentDirectory()
+ {
+ string tempCwd = GetRandomDirPath();
+ Directory.CreateDirectory(tempCwd);
+ Directory.SetCurrentDirectory(tempCwd);
+ return tempCwd;
+ }
+
+ public static IEnumerable SymbolicLink_LinkTarget_PathToTarget_Data
+ {
+ get
+ {
+ foreach (string path in PathToTargetData.Union(PathToTargetUncData))
+ {
+ yield return new object[] { path };
+ }
+ }
+ }
+
+ public static IEnumerable SymbolicLink_ResolveLinkTarget_PathToTarget_Data
+ {
+ get
+ {
+ foreach (string path in PathToTargetData.Union(PathToTargetUncData))
+ {
+ yield return new object[] { path, false };
+ yield return new object[] { path, true };
+ }
+ }
+ }
+
+ // Junctions doesn't support remote shares.
+ public static IEnumerable Junction_LinkTarget_PathToTarget_Data
+ {
+ get
+ {
+ foreach (string path in PathToTargetData)
+ {
+ yield return new object[] { path };
+ }
+ }
+ }
+
+ public static IEnumerable Junction_ResolveLinkTarget_PathToTarget_Data
+ {
+ get
+ {
+ foreach (string path in PathToTargetData)
+ {
+ yield return new object[] { path, false };
+ yield return new object[] { path, true };
+ }
+ }
+ }
+
+ internal static IEnumerable PathToTargetData
+ {
+ get
+ {
+ if (OperatingSystem.IsWindows())
+ {
+ //Non-rooted relative
+ yield return "foo";
+ yield return @".\foo";
+ yield return @"..\foo";
+ // Rooted relative
+ yield return @"\foo";
+ // Rooted absolute
+ yield return Path.Combine(Path.GetTempPath(), "foo");
+ // Extended DOS
+ yield return Path.Combine(@"\\?\", Path.GetTempPath(), "foo");
+ }
+ else
+ {
+ //Non-rooted relative
+ yield return "foo";
+ yield return "./foo";
+ yield return "../foo";
+ // Rooted relative
+ yield return "/foo";
+ // Rooted absolute
+ Path.Combine(Path.GetTempPath(), "foo");
+ }
+ }
+ }
+
+ internal static IEnumerable PathToTargetUncData
+ {
+ get
+ {
+ if (OperatingSystem.IsWindows())
+ {
+ // UNC/Remote Share
+ yield return @"\\LOCALHOST\share\path";
+ }
+ }
+ }
}
}
diff --git a/src/libraries/System.IO.FileSystem/tests/Directory/CreateDirectory.cs b/src/libraries/System.IO.FileSystem/tests/Directory/CreateDirectory.cs
index fb3a74305bca2c..4e53a93a4e03a9 100644
--- a/src/libraries/System.IO.FileSystem/tests/Directory/CreateDirectory.cs
+++ b/src/libraries/System.IO.FileSystem/tests/Directory/CreateDirectory.cs
@@ -270,8 +270,10 @@ public void DirectoryLongerThanMaxLongPathWithExtendedSyntax_ThrowsException()
{
var paths = IOInputs.GetPathsLongerThanMaxLongPath(GetTestFilePath(), useExtendedSyntax: true);
+ // Ideally this should be PathTooLongException or DirectoryNotFoundException but on some machines
+ // windows gives us ERROR_INVALID_NAME, producing IOException.
Assert.All(paths, path =>
- AssertExtensions.ThrowsAny(() => Create(path)));
+ AssertExtensions.ThrowsAny(() => Create(path)));
}
[ConditionalFact(nameof(LongPathsAreNotBlocked), nameof(UsingNewNormalization))]
diff --git a/src/libraries/System.IO.FileSystem/tests/Directory/GetSetTimes.cs b/src/libraries/System.IO.FileSystem/tests/Directory/GetSetTimes.cs
index 0a23d638c138af..1fc00ba74249d6 100644
--- a/src/libraries/System.IO.FileSystem/tests/Directory/GetSetTimes.cs
+++ b/src/libraries/System.IO.FileSystem/tests/Directory/GetSetTimes.cs
@@ -7,7 +7,9 @@ namespace System.IO.Tests
{
public class Directory_GetSetTimes : StaticGetSetTimes
{
- protected override string GetExistingItem() => Directory.CreateDirectory(GetTestFilePath()).FullName;
+ protected override bool CanBeReadOnly => false;
+
+ protected override string GetExistingItem(bool _) => Directory.CreateDirectory(GetTestFilePath()).FullName;
public override IEnumerable TimeFunctions(bool requiresRoundtripping = false)
{
diff --git a/src/libraries/System.IO.FileSystem/tests/DirectoryInfo/GetSetTimes.cs b/src/libraries/System.IO.FileSystem/tests/DirectoryInfo/GetSetTimes.cs
index 2dad268a79a460..c45c6169ada958 100644
--- a/src/libraries/System.IO.FileSystem/tests/DirectoryInfo/GetSetTimes.cs
+++ b/src/libraries/System.IO.FileSystem/tests/DirectoryInfo/GetSetTimes.cs
@@ -7,7 +7,9 @@ namespace System.IO.Tests
{
public class DirectoryInfo_GetSetTimes : InfoGetSetTimes
{
- protected override DirectoryInfo GetExistingItem() => Directory.CreateDirectory(GetTestFilePath());
+ protected override bool CanBeReadOnly => false;
+
+ protected override DirectoryInfo GetExistingItem(bool _) => Directory.CreateDirectory(GetTestFilePath());
protected override DirectoryInfo GetMissingItem() => new DirectoryInfo(GetTestFilePath());
diff --git a/src/libraries/System.IO.FileSystem/tests/Enumeration/SpecialDirectoryTests.cs b/src/libraries/System.IO.FileSystem/tests/Enumeration/SpecialDirectoryTests.cs
index 39a747179481a8..12edab6601e803 100644
--- a/src/libraries/System.IO.FileSystem/tests/Enumeration/SpecialDirectoryTests.cs
+++ b/src/libraries/System.IO.FileSystem/tests/Enumeration/SpecialDirectoryTests.cs
@@ -60,7 +60,14 @@ public void SkippingHiddenFiles()
{
// Files that begin with periods are considered hidden on Unix
string[] paths = GetNames(TestDirectory, new EnumerationOptions { ReturnSpecialDirectories = true, AttributesToSkip = 0 });
- Assert.Contains(".", paths);
+
+ if (!PlatformDetection.IsWindows10Version22000OrGreater)
+ {
+ // Sometimes this is not returned - presumably an OS bug.
+ // This occurs often on Windows 11, very rarely otherwise.
+ Assert.Contains(".", paths);
+ }
+
Assert.Contains("..", paths);
}
}
diff --git a/src/libraries/System.IO.FileSystem/tests/File/EncryptDecrypt.Windows.cs b/src/libraries/System.IO.FileSystem/tests/File/EncryptDecrypt.Windows.cs
new file mode 100644
index 00000000000000..015ba30b6ad7c1
--- /dev/null
+++ b/src/libraries/System.IO.FileSystem/tests/File/EncryptDecrypt.Windows.cs
@@ -0,0 +1,85 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using Microsoft.DotNet.XUnitExtensions;
+using System.Diagnostics;
+using System.Diagnostics.Eventing.Reader;
+using System.Linq;
+using System.Security;
+using System.ServiceProcess;
+using Xunit;
+using Xunit.Abstractions;
+
+namespace System.IO.Tests
+{
+ public partial class EncryptDecrypt
+ {
+ partial void EnsureEFSServiceStarted()
+ {
+ try
+ {
+ using var sc = new ServiceController("EFS");
+ _output.WriteLine($"EFS service is: {sc.Status}");
+ if (sc.Status != ServiceControllerStatus.Running)
+ {
+ _output.WriteLine("Trying to start EFS service");
+ sc.Start();
+ _output.WriteLine($"EFS service is now: {sc.Status}");
+ }
+ }
+ catch (Exception e)
+ {
+ _output.WriteLine(e.ToString());
+ }
+ }
+
+ partial void LogEFSDiagnostics()
+ {
+ int hours = 1; // how many hours to look backwards
+ string query = @$"
+
+
+
+
+
+
+ *[System[TimeCreated[timediff(@SystemTime) >= {hours * 60 * 60 * 1000L}]]]
+
+
+ ";
+
+ var eventQuery = new EventLogQuery("System", PathType.LogName, query);
+
+ using var eventReader = new EventLogReader(eventQuery);
+
+ EventRecord record = eventReader.ReadEvent();
+ var garbage = new string[] { "Background Intelligent", "Intel", "Defender", "Intune", "BITS", "NetBT"};
+
+ _output.WriteLine("===== Dumping recent relevant events: =====");
+ while (record != null)
+ {
+ string description = "";
+ try
+ {
+ description = record.FormatDescription();
+ }
+ catch (EventLogException) { }
+
+ if (!garbage.Any(term => description.Contains(term, StringComparison.OrdinalIgnoreCase)))
+ {
+ _output.WriteLine($"{record.TimeCreated} {record.ProviderName} [{record.LevelDisplayName} {record.Id}] {description.Replace("\r\n", " ")}");
+ }
+
+ record = eventReader.ReadEvent();
+ }
+
+ _output.WriteLine("==== Finished dumping =====");
+ }
+ }
+}
diff --git a/src/libraries/System.IO.FileSystem/tests/File/EncryptDecrypt.cs b/src/libraries/System.IO.FileSystem/tests/File/EncryptDecrypt.cs
index 984afef972bc41..1dbac453e48297 100644
--- a/src/libraries/System.IO.FileSystem/tests/File/EncryptDecrypt.cs
+++ b/src/libraries/System.IO.FileSystem/tests/File/EncryptDecrypt.cs
@@ -1,17 +1,28 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
+using Microsoft.DotNet.XUnitExtensions;
using System.Diagnostics;
+using System.Diagnostics.Eventing.Reader;
using System.Security;
+using System.ServiceProcess;
using Xunit;
+using Xunit.Abstractions;
namespace System.IO.Tests
{
[ActiveIssue("https://github.com/dotnet/runtime/issues/34582", TestPlatforms.Windows, TargetFrameworkMonikers.Netcoreapp, TestRuntimes.Mono)]
- public class EncryptDecrypt : FileSystemTest
+ public partial class EncryptDecrypt : FileSystemTest
{
+ private readonly ITestOutputHelper _output;
+
+ public EncryptDecrypt(ITestOutputHelper output)
+ {
+ _output = output;
+ }
+
[Fact]
- public static void NullArg_ThrowsException()
+ public void NullArg_ThrowsException()
{
AssertExtensions.Throws("path", () => File.Encrypt(null));
AssertExtensions.Throws("path", () => File.Decrypt(null));
@@ -19,7 +30,7 @@ public static void NullArg_ThrowsException()
[SkipOnTargetFramework(TargetFrameworkMonikers.Netcoreapp)]
[Fact]
- public static void EncryptDecrypt_NotSupported()
+ public void EncryptDecrypt_NotSupported()
{
Assert.Throws(() => File.Encrypt("path"));
Assert.Throws(() => File.Decrypt("path"));
@@ -29,7 +40,8 @@ public static void EncryptDecrypt_NotSupported()
// because EFS (Encrypted File System), its underlying technology, is not available on these operating systems.
[ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsNotWindowsNanoServer), nameof(PlatformDetection.IsNotWindowsHomeEdition))]
[PlatformSpecific(TestPlatforms.Windows)]
- public static void EncryptDecrypt_Read()
+ [OuterLoop] // Occasional failures: https://github.com/dotnet/runtime/issues/12339
+ public void EncryptDecrypt_Read()
{
string tmpFileName = Path.GetTempFileName();
string textContentToEncrypt = "Content to encrypt";
@@ -39,14 +51,26 @@ public static void EncryptDecrypt_Read()
string fileContentRead = File.ReadAllText(tmpFileName);
Assert.Equal(textContentToEncrypt, fileContentRead);
+ EnsureEFSServiceStarted();
+
try
{
File.Encrypt(tmpFileName);
}
- catch (IOException e) when (e.HResult == unchecked((int)0x80070490))
+ catch (IOException e) when (e.HResult == unchecked((int)0x80070490) ||
+ e.HResult == unchecked((int)0x80071776) ||
+ e.HResult == unchecked((int)0x800701AE))
{
// Ignore ERROR_NOT_FOUND 1168 (0x490). It is reported when EFS is disabled by domain policy.
- return;
+ // Ignore ERROR_NO_USER_KEYS (0x1776). This occurs when no user key exists to encrypt with.
+ // Ignore ERROR_ENCRYPTION_DISABLED (0x1AE). This occurs when EFS is disabled by group policy on the volume.
+ throw new SkipTestException($"Encrypt not available. Error 0x{e.HResult:X}");
+ }
+ catch (IOException e)
+ {
+ _output.WriteLine($"Encrypt failed with {e.Message} 0x{e.HResult:X}");
+ LogEFSDiagnostics();
+ throw;
}
Assert.Equal(fileContentRead, File.ReadAllText(tmpFileName));
@@ -61,5 +85,9 @@ public static void EncryptDecrypt_Read()
File.Delete(tmpFileName);
}
}
+
+ partial void EnsureEFSServiceStarted(); // no-op on Unix
+
+ partial void LogEFSDiagnostics(); // no-op on Unix currently
}
}
diff --git a/src/libraries/System.IO.FileSystem/tests/File/GetSetTimes.cs b/src/libraries/System.IO.FileSystem/tests/File/GetSetTimes.cs
index 67a13bcf7df2b5..f27e79da3f565a 100644
--- a/src/libraries/System.IO.FileSystem/tests/File/GetSetTimes.cs
+++ b/src/libraries/System.IO.FileSystem/tests/File/GetSetTimes.cs
@@ -11,14 +11,22 @@ namespace System.IO.Tests
{
public class File_GetSetTimes : StaticGetSetTimes
{
+ protected override bool CanBeReadOnly => true;
+
// OSX has the limitation of setting upto 2262-04-11T23:47:16 (long.Max) date.
// 32bit Unix has time_t up to ~ 2038.
private static bool SupportsLongMaxDateTime => PlatformDetection.IsWindows || (!PlatformDetection.Is32BitProcess && !PlatformDetection.IsOSXLike);
- protected override string GetExistingItem()
+ protected override string GetExistingItem(bool readOnly = false)
{
string path = GetTestFilePath();
File.Create(path).Dispose();
+
+ if (readOnly)
+ {
+ File.SetAttributes(path, FileAttributes.ReadOnly);
+ }
+
return path;
}
diff --git a/src/libraries/System.IO.FileSystem/tests/File/Open.cs b/src/libraries/System.IO.FileSystem/tests/File/Open.cs
index d014cf0efb94d8..bd9b38b121b886 100644
--- a/src/libraries/System.IO.FileSystem/tests/File/Open.cs
+++ b/src/libraries/System.IO.FileSystem/tests/File/Open.cs
@@ -42,15 +42,14 @@ protected override FileStream CreateFileStream(string path, FileMode mode, FileA
}
}
- public class File_Open_str_options_as : FileStream_ctor_options_as
+ public class File_Open_str_options : FileStream_ctor_options
{
protected override FileStream CreateFileStream(string path, FileMode mode)
{
return File.Open(path,
new FileStreamOptions {
Mode = mode,
- Access = mode == FileMode.Append ? FileAccess.Write : FileAccess.ReadWrite,
- PreallocationSize = PreallocationSize
+ Access = mode == FileMode.Append ? FileAccess.Write : FileAccess.ReadWrite
});
}
@@ -59,12 +58,23 @@ protected override FileStream CreateFileStream(string path, FileMode mode, FileA
return File.Open(path,
new FileStreamOptions {
Mode = mode,
- Access = access,
- PreallocationSize = PreallocationSize
+ Access = access
});
}
protected override FileStream CreateFileStream(string path, FileMode mode, FileAccess access, FileShare share, int bufferSize, FileOptions options)
+ {
+ return File.Open(path,
+ new FileStreamOptions {
+ Mode = mode,
+ Access = access,
+ Share = share,
+ Options = options,
+ BufferSize = bufferSize
+ });
+ }
+
+ protected override FileStream CreateFileStream(string path, FileMode mode, FileAccess access, FileShare share, int bufferSize, FileOptions options, long preallocationSize)
{
return File.Open(path,
new FileStreamOptions {
@@ -73,7 +83,7 @@ protected override FileStream CreateFileStream(string path, FileMode mode, FileA
Share = share,
Options = options,
BufferSize = bufferSize,
- PreallocationSize = PreallocationSize
+ PreallocationSize = preallocationSize
});
}
}
diff --git a/src/libraries/System.IO.FileSystem/tests/File/OpenHandle.cs b/src/libraries/System.IO.FileSystem/tests/File/OpenHandle.cs
index a8b3619fb51cf7..120ed9aec222ef 100644
--- a/src/libraries/System.IO.FileSystem/tests/File/OpenHandle.cs
+++ b/src/libraries/System.IO.FileSystem/tests/File/OpenHandle.cs
@@ -7,28 +7,24 @@
namespace System.IO.Tests
{
// to avoid a lot of code duplication, we reuse FileStream tests
- public class File_OpenHandle : FileStream_ctor_options_as
+ public class File_OpenHandle : FileStream_ctor_options
{
protected override string GetExpectedParamName(string paramName) => paramName;
protected override FileStream CreateFileStream(string path, FileMode mode)
{
FileAccess access = mode == FileMode.Append ? FileAccess.Write : FileAccess.ReadWrite;
- return new FileStream(File.OpenHandle(path, mode, access, preallocationSize: PreallocationSize), access);
+ return new FileStream(File.OpenHandle(path, mode, access), access);
}
protected override FileStream CreateFileStream(string path, FileMode mode, FileAccess access)
- => new FileStream(File.OpenHandle(path, mode, access, preallocationSize: PreallocationSize), access);
+ => new FileStream(File.OpenHandle(path, mode, access), access);
protected override FileStream CreateFileStream(string path, FileMode mode, FileAccess access, FileShare share, int bufferSize, FileOptions options)
- => new FileStream(File.OpenHandle(path, mode, access, share, options, PreallocationSize), access, bufferSize, (options & FileOptions.Asynchronous) != 0);
+ => new FileStream(File.OpenHandle(path, mode, access, share, options), access, bufferSize, (options & FileOptions.Asynchronous) != 0);
- [Fact]
- public override void NegativePreallocationSizeThrows()
- {
- ArgumentOutOfRangeException ex = Assert.Throws(
- () => File.OpenHandle("validPath", FileMode.CreateNew, FileAccess.Write, FileShare.None, FileOptions.None, preallocationSize: -1));
- }
+ protected override FileStream CreateFileStream(string path, FileMode mode, FileAccess access, FileShare share, int bufferSize, FileOptions options, long preallocationSize)
+ => new FileStream(File.OpenHandle(path, mode, access, share, options, preallocationSize), access, bufferSize, (options & FileOptions.Asynchronous) != 0);
[ActiveIssue("https://github.com/dotnet/runtime/issues/53432")]
[Theory, MemberData(nameof(StreamSpecifiers))]
diff --git a/src/libraries/System.IO.FileSystem/tests/File/ReadWriteAllBytes.cs b/src/libraries/System.IO.FileSystem/tests/File/ReadWriteAllBytes.cs
index 54c76437663353..a7815dd40eb126 100644
--- a/src/libraries/System.IO.FileSystem/tests/File/ReadWriteAllBytes.cs
+++ b/src/libraries/System.IO.FileSystem/tests/File/ReadWriteAllBytes.cs
@@ -2,8 +2,11 @@
// The .NET Foundation licenses this file to you under the MIT license.
using System.Text;
+using System.Threading;
using System.Threading.Tasks;
using Xunit;
+using System.IO.Pipes;
+using Microsoft.DotNet.XUnitExtensions;
namespace System.IO.Tests
{
@@ -54,21 +57,6 @@ public void ValidWrite(int size)
File.Delete(path);
}
- [Fact]
- [OuterLoop]
- [ActiveIssue("https://github.com/dotnet/runtime/issues/45954", TestPlatforms.Browser)]
- public void ReadFileOver2GB()
- {
- string path = GetTestFilePath();
- using (FileStream fs = File.Create(path))
- {
- fs.SetLength(int.MaxValue + 1L);
- }
-
- // File is too large for ReadAllBytes at once
- Assert.Throws(() => File.ReadAllBytes(path));
- }
-
[Fact]
public void Overwrite()
{
@@ -172,5 +160,30 @@ public void ProcFs_NotEmpty(string path)
{
Assert.InRange(File.ReadAllBytes(path).Length, 1, int.MaxValue);
}
+
+ [Fact]
+ [PlatformSpecific(TestPlatforms.AnyUnix & ~TestPlatforms.Browser)]
+ public async Task ReadAllBytes_NonSeekableFileStream_InUnix()
+ {
+ string fifoPath = GetTestFilePath();
+ Assert.Equal(0, mkfifo(fifoPath, 438 /* 666 in octal */ ));
+
+ var contentBytes = new byte[] { 1, 2, 3 };
+
+ await Task.WhenAll(
+ Task.Run(() =>
+ {
+ byte[] readBytes = File.ReadAllBytes(fifoPath);
+ Assert.Equal(contentBytes, readBytes);
+ }),
+ Task.Run(() =>
+ {
+ using var fs = new FileStream(fifoPath, FileMode.Open, FileAccess.Write, FileShare.Read);
+ foreach (byte content in contentBytes)
+ {
+ fs.WriteByte(content);
+ }
+ }));
+ }
}
}
diff --git a/src/libraries/System.IO.FileSystem/tests/File/ReadWriteAllBytesAsync.cs b/src/libraries/System.IO.FileSystem/tests/File/ReadWriteAllBytesAsync.cs
index 748c01dbffb8f6..c4f147cbb80092 100644
--- a/src/libraries/System.IO.FileSystem/tests/File/ReadWriteAllBytesAsync.cs
+++ b/src/libraries/System.IO.FileSystem/tests/File/ReadWriteAllBytesAsync.cs
@@ -5,6 +5,7 @@
using System.Threading;
using System.Threading.Tasks;
using Xunit;
+using System.IO.Pipes;
namespace System.IO.Tests
{
@@ -68,21 +69,6 @@ public Task AlreadyCanceledAsync()
async () => await File.WriteAllBytesAsync(path, new byte[0], token));
}
- [Fact]
- [OuterLoop]
- [ActiveIssue("https://github.com/dotnet/runtime/issues/45954", TestPlatforms.Browser)]
- public Task ReadFileOver2GBAsync()
- {
- string path = GetTestFilePath();
- using (FileStream fs = File.Create(path))
- {
- fs.SetLength(int.MaxValue + 1L);
- }
-
- // File is too large for ReadAllBytes at once
- return Assert.ThrowsAsync(async () => await File.ReadAllBytesAsync(path));
- }
-
[Fact]
public async Task OverwriteAsync()
{
@@ -186,5 +172,61 @@ public async Task ProcFs_NotEmpty(string path)
{
Assert.InRange((await File.ReadAllBytesAsync(path)).Length, 1, int.MaxValue);
}
+
+ [Fact]
+ [PlatformSpecific(TestPlatforms.Windows)] // DOS device paths (\\.\ and \\?\) are a Windows concept
+ public async Task ReadAllBytesAsync_NonSeekableFileStream_InWindows()
+ {
+ string pipeName = FileSystemTest.GetNamedPipeServerStreamName();
+ string pipePath = Path.GetFullPath($@"\\.\pipe\{pipeName}");
+
+ var namedPipeWriterStream = new NamedPipeServerStream(pipeName, PipeDirection.Out);
+ var contentBytes = new byte[] { 1, 2, 3 };
+
+ using (var cts = new CancellationTokenSource())
+ {
+ Task writingServerTask = WaitConnectionAndWritePipeStreamAsync(namedPipeWriterStream, contentBytes, cts.Token);
+ Task readTask = File.ReadAllBytesAsync(pipePath, cts.Token);
+ cts.CancelAfter(TimeSpan.FromSeconds(50));
+
+ await writingServerTask;
+ byte[] readBytes = await readTask;
+ Assert.Equal(contentBytes, readBytes);
+ }
+
+ static async Task WaitConnectionAndWritePipeStreamAsync(NamedPipeServerStream namedPipeWriterStream, byte[] contentBytes, CancellationToken cancellationToken)
+ {
+ await using (namedPipeWriterStream)
+ {
+ await namedPipeWriterStream.WaitForConnectionAsync(cancellationToken);
+ await namedPipeWriterStream.WriteAsync(contentBytes, cancellationToken);
+ }
+ }
+ }
+
+ [Fact]
+ [PlatformSpecific(TestPlatforms.AnyUnix & ~TestPlatforms.Browser)]
+ public async Task ReadAllBytesAsync_NonSeekableFileStream_InUnix()
+ {
+ string fifoPath = GetTestFilePath();
+ Assert.Equal(0, mkfifo(fifoPath, 438 /* 666 in octal */ ));
+
+ var contentBytes = new byte[] { 1, 2, 3 };
+
+ await Task.WhenAll(
+ Task.Run(async () =>
+ {
+ byte[] readBytes = await File.ReadAllBytesAsync(fifoPath);
+ Assert.Equal(contentBytes, readBytes);
+ }),
+ Task.Run(() =>
+ {
+ using var fs = new FileStream(fifoPath, FileMode.Open, FileAccess.Write, FileShare.Read);
+ foreach (byte content in contentBytes)
+ {
+ fs.WriteByte(content);
+ }
+ }));
+ }
}
}
diff --git a/src/libraries/System.IO.FileSystem/tests/File/SymbolicLinks.cs b/src/libraries/System.IO.FileSystem/tests/File/SymbolicLinks.cs
index 4c41fa7bb16576..e879cb353af73d 100644
--- a/src/libraries/System.IO.FileSystem/tests/File/SymbolicLinks.cs
+++ b/src/libraries/System.IO.FileSystem/tests/File/SymbolicLinks.cs
@@ -45,6 +45,21 @@ protected override void AssertLinkExists(FileSystemInfo link) =>
public void ResolveLinkTarget_Throws_NotExists() =>
ResolveLinkTarget_Throws_NotExists_Internal();
+ [Fact]
+ [PlatformSpecific(TestPlatforms.Windows)]
+ public void UnsupportedLink_ReturnsNull()
+ {
+ string unsupportedLinkPath = GetAppExecLinkPath();
+ if (unsupportedLinkPath is null)
+ {
+ return;
+ }
+
+ Assert.Null(File.ResolveLinkTarget(unsupportedLinkPath, false));
+ Assert.Null(File.ResolveLinkTarget(unsupportedLinkPath, true));
+ }
+
+
[ConditionalFact(typeof(RemoteExecutor), nameof(RemoteExecutor.IsSupported))]
public void CreateSymbolicLink_PathToTarget_RelativeToLinkPath()
{
diff --git a/src/libraries/System.IO.FileSystem/tests/FileInfo/GetSetTimes.cs b/src/libraries/System.IO.FileSystem/tests/FileInfo/GetSetTimes.cs
index d3b9764951cbfd..1ca30617292ebd 100644
--- a/src/libraries/System.IO.FileSystem/tests/FileInfo/GetSetTimes.cs
+++ b/src/libraries/System.IO.FileSystem/tests/FileInfo/GetSetTimes.cs
@@ -10,10 +10,18 @@ namespace System.IO.Tests
{
public class FileInfo_GetSetTimes : InfoGetSetTimes
{
- protected override FileInfo GetExistingItem()
+ protected override bool CanBeReadOnly => true;
+
+ protected override FileInfo GetExistingItem(bool readOnly = false)
{
string path = GetTestFilePath();
File.Create(path).Dispose();
+
+ if (readOnly)
+ {
+ File.SetAttributes(path, FileAttributes.ReadOnly);
+ }
+
return new FileInfo(path);
}
diff --git a/src/libraries/System.IO.FileSystem/tests/FileInfo/Open.cs b/src/libraries/System.IO.FileSystem/tests/FileInfo/Open.cs
index 2324a92eafce4f..36fd39a6000564 100644
--- a/src/libraries/System.IO.FileSystem/tests/FileInfo/Open.cs
+++ b/src/libraries/System.IO.FileSystem/tests/FileInfo/Open.cs
@@ -74,15 +74,14 @@ protected override FileStream CreateFileStream(string path, FileMode mode, FileA
}
}
- public class FileInfo_Open_options_as : FileStream_ctor_options_as
+ public class FileInfo_Open_options : FileStream_ctor_options
{
protected override FileStream CreateFileStream(string path, FileMode mode)
{
return new FileInfo(path).Open(
new FileStreamOptions {
Mode = mode,
- Access = mode == FileMode.Append ? FileAccess.Write : FileAccess.ReadWrite,
- PreallocationSize = PreallocationSize
+ Access = mode == FileMode.Append ? FileAccess.Write : FileAccess.ReadWrite
});
}
@@ -91,12 +90,23 @@ protected override FileStream CreateFileStream(string path, FileMode mode, FileA
return new FileInfo(path).Open(
new FileStreamOptions {
Mode = mode,
- Access = access,
- PreallocationSize = PreallocationSize
+ Access = access
});
}
protected override FileStream CreateFileStream(string path, FileMode mode, FileAccess access, FileShare share, int bufferSize, FileOptions options)
+ {
+ return new FileInfo(path).Open(
+ new FileStreamOptions {
+ Mode = mode,
+ Access = access,
+ Share = share,
+ Options = options,
+ BufferSize = bufferSize
+ });
+ }
+
+ protected override FileStream CreateFileStream(string path, FileMode mode, FileAccess access, FileShare share, int bufferSize, FileOptions options, long preallocationSize)
{
return new FileInfo(path).Open(
new FileStreamOptions {
@@ -105,7 +115,7 @@ protected override FileStream CreateFileStream(string path, FileMode mode, FileA
Share = share,
Options = options,
BufferSize = bufferSize,
- PreallocationSize = PreallocationSize
+ PreallocationSize = preallocationSize
});
}
}
diff --git a/src/libraries/System.IO.FileSystem/tests/FileInfo/SymbolicLinks.cs b/src/libraries/System.IO.FileSystem/tests/FileInfo/SymbolicLinks.cs
index fa334dd1ca376d..914edd06a1ba65 100644
--- a/src/libraries/System.IO.FileSystem/tests/FileInfo/SymbolicLinks.cs
+++ b/src/libraries/System.IO.FileSystem/tests/FileInfo/SymbolicLinks.cs
@@ -41,6 +41,24 @@ protected override void AssertLinkExists(FileSystemInfo link) =>
public void ResolveLinkTarget_Throws_NotExists() =>
ResolveLinkTarget_Throws_NotExists_Internal();
+
+ [Fact]
+ [PlatformSpecific(TestPlatforms.Windows)]
+ public void UnsupportedLink_ReturnsNull()
+ {
+ string unsupportedLinkPath = GetAppExecLinkPath();
+ if (unsupportedLinkPath is null)
+ {
+ return;
+ }
+
+ var info = new FileInfo(unsupportedLinkPath);
+
+ Assert.Null(info.LinkTarget);
+ Assert.Null(info.ResolveLinkTarget(false));
+ Assert.Null(info.ResolveLinkTarget(true));
+ }
+
[ConditionalFact(typeof(RemoteExecutor), nameof(RemoteExecutor.IsSupported))]
public void CreateSymbolicLink_PathToTarget_RelativeToLinkPath()
{
diff --git a/src/libraries/System.IO.FileSystem/tests/FileStream/DevicesPipesAndSockets.cs b/src/libraries/System.IO.FileSystem/tests/FileStream/DevicesPipesAndSockets.cs
new file mode 100644
index 00000000000000..ede852c7305b3f
--- /dev/null
+++ b/src/libraries/System.IO.FileSystem/tests/FileStream/DevicesPipesAndSockets.cs
@@ -0,0 +1,219 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using Microsoft.DotNet.XUnitExtensions;
+using Microsoft.Win32.SafeHandles;
+using System.Collections.Generic;
+using System.IO.Pipes;
+using System.Runtime.InteropServices;
+using System.Text;
+using System.Threading.Tasks;
+using Xunit;
+
+namespace System.IO.Tests
+{
+ [PlatformSpecific(TestPlatforms.AnyUnix)]
+ public class DevicesPipesAndSockets : FileSystemTest
+ {
+ [Theory]
+ [MemberData(nameof(DevicePath_FileOptions_TestData))]
+ public void CharacterDevice_FileStream_Write(string devicePath, FileOptions fileOptions)
+ {
+ FileStreamOptions options = new() { Options = fileOptions, Access = FileAccess.Write, Share = FileShare.Write };
+ using FileStream fs = new(devicePath, options);
+ fs.Write(Encoding.UTF8.GetBytes("foo"));
+ }
+
+ [Theory]
+ [MemberData(nameof(DevicePath_FileOptions_TestData))]
+ public async Task CharacterDevice_FileStream_WriteAsync(string devicePath, FileOptions fileOptions)
+ {
+ FileStreamOptions options = new() { Options = fileOptions, Access = FileAccess.Write, Share = FileShare.Write };
+ using FileStream fs = new(devicePath, options);
+ await fs.WriteAsync(Encoding.UTF8.GetBytes("foo"));
+ }
+
+ [Theory]
+ [MemberData(nameof(DevicePath_TestData))]
+ public void CharacterDevice_WriteAllBytes(string devicePath)
+ {
+ File.WriteAllBytes(devicePath, Encoding.UTF8.GetBytes("foo"));
+ }
+
+ [Theory]
+ [MemberData(nameof(DevicePath_TestData))]
+ public async Task CharacterDevice_WriteAllBytesAsync(string devicePath)
+ {
+ await File.WriteAllBytesAsync(devicePath, Encoding.UTF8.GetBytes("foo"));
+ }
+
+ [Theory]
+ [MemberData(nameof(DevicePath_TestData))]
+ public void CharacterDevice_WriteAllText(string devicePath)
+ {
+ File.WriteAllText(devicePath, "foo");
+ }
+
+ [Theory]
+ [MemberData(nameof(DevicePath_TestData))]
+ public async Task CharacterDevice_WriteAllTextAsync(string devicePath)
+ {
+ await File.WriteAllTextAsync(devicePath, "foo");
+ }
+
+ [Fact]
+ [PlatformSpecific(TestPlatforms.AnyUnix & ~TestPlatforms.Browser)]
+ public async Task NamedPipe_ReadWrite()
+ {
+ string fifoPath = GetTestFilePath();
+ Assert.Equal(0, mkfifo(fifoPath, 438 /* 666 in octal */ ));
+
+ await Task.WhenAll(
+ Task.Run(() =>
+ {
+ using var fs = new FileStream(fifoPath, FileMode.Open, FileAccess.Read, FileShare.ReadWrite);
+ ReadByte(fs, 42);
+ }),
+ Task.Run(() =>
+ {
+ using var fs = new FileStream(fifoPath, FileMode.Open, FileAccess.Write, FileShare.Read);
+ WriteByte(fs, 42);
+ }));
+ }
+
+ [Fact]
+ [PlatformSpecific(TestPlatforms.AnyUnix & ~TestPlatforms.Browser)]
+ public async Task NamedPipe_ReadWrite_Async()
+ {
+ string fifoPath = GetTestFilePath();
+ Assert.Equal(0, mkfifo(fifoPath, 438 /* 666 in octal */ ));
+
+ await Task.WhenAll(
+ Task.Run(async () => {
+ using var fs = new FileStream(fifoPath, FileMode.Open, FileAccess.Read, FileShare.ReadWrite);
+ await ReadByteAsync(fs, 42);
+ }),
+ Task.Run(async () =>
+ {
+ using var fs = new FileStream(fifoPath, FileMode.Open, FileAccess.Write, FileShare.Read);
+ await WriteByteAsync(fs, 42);
+ }));
+ }
+
+ private const int AF_UNIX = 1;
+ private const int SOCK_STREAM = 1;
+
+ [Fact]
+ [PlatformSpecific(TestPlatforms.AnyUnix & ~TestPlatforms.Browser)]
+ public unsafe void SocketPair_ReadWrite()
+ {
+ int* ptr = stackalloc int[2];
+ Assert.Equal(0, socketpair(AF_UNIX, SOCK_STREAM, 0, ptr));
+
+ using var readFileStream = new FileStream(new SafeFileHandle((IntPtr)ptr[0], ownsHandle: true), FileAccess.Read);
+ using var writeFileStream = new FileStream(new SafeFileHandle((IntPtr)ptr[1], ownsHandle: true), FileAccess.Write);
+
+ Task.WhenAll(
+ Task.Run(() => ReadByte(readFileStream, 42)),
+ Task.Run(() => WriteByte(writeFileStream, 42))).GetAwaiter().GetResult();
+ }
+
+ [Fact]
+ [PlatformSpecific(TestPlatforms.AnyUnix & ~TestPlatforms.Browser)]
+ public void SocketPair_ReadWrite_Async()
+ {
+ unsafe
+ {
+ int* ptr = stackalloc int[2];
+ Assert.Equal(0, socketpair(AF_UNIX, SOCK_STREAM, 0, ptr));
+
+ using var readFileStream = new FileStream(new SafeFileHandle((IntPtr)ptr[0], ownsHandle: true), FileAccess.Read);
+ using var writeFileStream = new FileStream(new SafeFileHandle((IntPtr)ptr[1], ownsHandle: true), FileAccess.Write);
+
+ Task.WhenAll(
+ ReadByteAsync(readFileStream, 42),
+ WriteByteAsync(writeFileStream, 42)).GetAwaiter().GetResult();
+ }
+ }
+
+ private static void ReadByte(FileStream fs, byte expected)
+ {
+ var buffer = new byte[1];
+ Assert.Equal(1, fs.Read(buffer));
+ Assert.Equal(expected, buffer[0]);
+ }
+
+ private static void WriteByte(FileStream fs, byte value)
+ {
+ fs.Write(new byte[] { value });
+ fs.Flush();
+ }
+
+ private static async Task ReadByteAsync(FileStream fs, byte expected)
+ {
+ var buffer = new byte[1];
+ Assert.Equal(1, await fs.ReadAsync(buffer));
+ Assert.Equal(expected, buffer[0]);
+ }
+
+ private static async Task WriteByteAsync(FileStream fs, byte value)
+ {
+ await fs.WriteAsync(new byte[] { value });
+ await fs.FlushAsync();
+ }
+
+ private static Lazy> AvailableDevicePaths = new Lazy>(() =>
+ {
+ List paths = new();
+ FileStreamOptions options = new() { Access = FileAccess.Write, Share = FileShare.Write };
+
+ foreach (string devicePath in new[] { "/dev/tty", "/dev/console", "/dev/null", "/dev/zero" })
+ {
+ if (!File.Exists(devicePath))
+ {
+ continue;
+ }
+
+ try
+ {
+ File.Open(devicePath, options).Dispose();
+ }
+ catch (Exception ex)
+ {
+ if (ex is IOException || ex is UnauthorizedAccessException)
+ {
+ continue;
+ }
+
+ throw;
+ }
+
+ paths.Add(devicePath);
+ }
+
+ return paths;
+ });
+
+ public static IEnumerable DevicePath_FileOptions_TestData()
+ {
+ foreach (string devicePath in AvailableDevicePaths.Value)
+ {
+ foreach (FileOptions options in new[] { FileOptions.None, FileOptions.Asynchronous })
+ {
+ yield return new object[] { devicePath, options};
+ }
+ }
+ }
+
+ public static IEnumerable DevicePath_TestData()
+ {
+ foreach (string devicePath in AvailableDevicePaths.Value)
+ {
+ yield return new object[] { devicePath };
+ }
+ }
+
+ [DllImport("libc")]
+ private static unsafe extern int socketpair(int domain, int type, int protocol, int* ptr);
+ }
+}
diff --git a/src/libraries/System.IO.FileSystem/tests/FileStream/SafeFileHandle.cs b/src/libraries/System.IO.FileSystem/tests/FileStream/SafeFileHandle.cs
index 0740eed02f0d85..0c49a52abbcf1e 100644
--- a/src/libraries/System.IO.FileSystem/tests/FileStream/SafeFileHandle.cs
+++ b/src/libraries/System.IO.FileSystem/tests/FileStream/SafeFileHandle.cs
@@ -78,6 +78,18 @@ public async Task ThrowWhenHandlePositionIsChanged_async()
await ThrowWhenHandlePositionIsChanged(useAsync: true);
}
+ [ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsFileLockingEnabled))]
+ public void DeleteOnClose_FailedShareDoesNotDeleteFile()
+ {
+ string fileName = GetTestFilePath();
+
+ using SafeFileHandle handle = File.OpenHandle(fileName, FileMode.OpenOrCreate, FileAccess.Write, FileShare.None);
+
+ Assert.Throws(() => File.OpenHandle(fileName, FileMode.Open, FileAccess.Write, FileShare.None, FileOptions.DeleteOnClose));
+
+ Assert.True(File.Exists(fileName));
+ }
+
private async Task ThrowWhenHandlePositionIsChanged(bool useAsync)
{
string fileName = GetTestFilePath();
diff --git a/src/libraries/System.IO.FileSystem/tests/FileStream/ctor_options.Browser.cs b/src/libraries/System.IO.FileSystem/tests/FileStream/ctor_options.Browser.cs
new file mode 100644
index 00000000000000..45326d885c455d
--- /dev/null
+++ b/src/libraries/System.IO.FileSystem/tests/FileStream/ctor_options.Browser.cs
@@ -0,0 +1,17 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+namespace System.IO.Tests
+{
+ public partial class FileStream_ctor_options
+ {
+ private static long GetAllocatedSize(FileStream fileStream)
+ {
+ return 0;
+ }
+
+ private static bool SupportsPreallocation => false;
+
+ private static bool IsGetAllocatedSizeImplemented => false;
+ }
+}
diff --git a/src/libraries/System.IO.FileSystem/tests/FileStream/ctor_options.Unix.cs b/src/libraries/System.IO.FileSystem/tests/FileStream/ctor_options.Unix.cs
new file mode 100644
index 00000000000000..c33c56a1fa5706
--- /dev/null
+++ b/src/libraries/System.IO.FileSystem/tests/FileStream/ctor_options.Unix.cs
@@ -0,0 +1,36 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Diagnostics;
+using System.Runtime.InteropServices;
+
+namespace System.IO.Tests
+{
+ public partial class FileStream_ctor_options
+ {
+ private static long GetAllocatedSize(FileStream fileStream)
+ {
+ bool isOSX = RuntimeInformation.IsOSPlatform(OSPlatform.OSX);
+ // Call 'stat' to get the number of blocks, and size of blocks.
+ using var px = Process.Start(new ProcessStartInfo
+ {
+ FileName = "stat",
+ ArgumentList = { isOSX ? "-f" : "-c",
+ isOSX ? "%b %k" : "%b %B",
+ fileStream.Name },
+ RedirectStandardOutput = true
+ });
+ string stdout = px.StandardOutput.ReadToEnd();
+
+ string[] parts = stdout.Split(' ');
+ return long.Parse(parts[0]) * long.Parse(parts[1]);
+ }
+
+ private static bool SupportsPreallocation =>
+ RuntimeInformation.IsOSPlatform(OSPlatform.Linux) ||
+ RuntimeInformation.IsOSPlatform(OSPlatform.OSX);
+
+ // Mobile platforms don't support Process.Start.
+ private static bool IsGetAllocatedSizeImplemented => !PlatformDetection.IsMobile;
+ }
+}
diff --git a/src/libraries/System.IO.FileSystem/tests/FileStream/ctor_options_as.Windows.cs b/src/libraries/System.IO.FileSystem/tests/FileStream/ctor_options.Windows.cs
similarity index 71%
rename from src/libraries/System.IO.FileSystem/tests/FileStream/ctor_options_as.Windows.cs
rename to src/libraries/System.IO.FileSystem/tests/FileStream/ctor_options.Windows.cs
index bde8cd5e4692a3..2dca6baf22bd07 100644
--- a/src/libraries/System.IO.FileSystem/tests/FileStream/ctor_options_as.Windows.cs
+++ b/src/libraries/System.IO.FileSystem/tests/FileStream/ctor_options.Windows.cs
@@ -1,21 +1,17 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
+using System.IO.Pipes;
using System.Runtime.InteropServices;
using System.Text;
+using System.Threading.Tasks;
using Xunit;
namespace System.IO.Tests
{
- public partial class FileStream_ctor_options_as : FileStream_ctor_options_as_base
+ public partial class FileStream_ctor_options
{
- protected override long PreallocationSize => 10;
-
- protected override long InitialLength => 0; // Windows modifies AllocationSize, but not EndOfFile (file length)
-
- private long GetExpectedFileLength(long preallocationSize) => 0; // Windows modifies AllocationSize, but not EndOfFile (file length)
-
- private unsafe long GetActualPreallocationSize(FileStream fileStream)
+ private unsafe long GetAllocatedSize(FileStream fileStream)
{
Interop.Kernel32.FILE_STANDARD_INFO info;
@@ -24,6 +20,10 @@ private unsafe long GetActualPreallocationSize(FileStream fileStream)
return info.AllocationSize;
}
+ private static bool SupportsPreallocation => true;
+
+ private static bool IsGetAllocatedSizeImplemented => true;
+
[Theory]
[InlineData(@"\\?\")]
[InlineData(@"\??\")]
@@ -32,26 +32,26 @@ public void ExtendedPathsAreSupported(string prefix)
{
const long preallocationSize = 123;
- string filePath = prefix + Path.GetFullPath(GetPathToNonExistingFile());
+ string filePath = prefix + Path.GetFullPath(GetTestFilePath());
- using (var fs = new FileStream(filePath, GetOptions(FileMode.CreateNew, FileAccess.Write, FileShare.None, FileOptions.None, preallocationSize)))
+ using (var fs = CreateFileStream(filePath, FileMode.CreateNew, FileAccess.Write, FileShare.None, bufferSize: 4096, FileOptions.None, preallocationSize))
{
- Assert.True(GetActualPreallocationSize(fs) >= preallocationSize, $"Provided {preallocationSize}, actual: {GetActualPreallocationSize(fs)}");
+ Assert.Equal(0, fs.Length);
+ Assert.True(GetAllocatedSize(fs) >= preallocationSize);
}
}
[ConditionalTheory(nameof(IsFat32))]
[InlineData(FileMode.Create)]
[InlineData(FileMode.CreateNew)]
- [InlineData(FileMode.OpenOrCreate)]
public void WhenFileIsTooLargeTheErrorMessageContainsAllDetails(FileMode mode)
{
const long tooMuch = uint.MaxValue + 1L; // more than FAT32 max size
- string filePath = GetPathToNonExistingFile();
+ string filePath = GetTestFilePath();
Assert.StartsWith(Path.GetTempPath(), filePath); // this is what IsFat32 method relies on
- IOException ex = Assert.Throws(() => new FileStream(filePath, GetOptions(mode, FileAccess.Write, FileShare.None, FileOptions.None, tooMuch)));
+ IOException ex = Assert.Throws(() => CreateFileStream(filePath, mode, FileAccess.Write, FileShare.None, bufferSize: 4096, FileOptions.None, tooMuch));
Assert.Contains(filePath, ex.Message);
Assert.Contains(tooMuch.ToString(), ex.Message);
diff --git a/src/libraries/System.IO.FileSystem/tests/FileStream/ctor_options.cs b/src/libraries/System.IO.FileSystem/tests/FileStream/ctor_options.cs
new file mode 100644
index 00000000000000..5209d5ef76d427
--- /dev/null
+++ b/src/libraries/System.IO.FileSystem/tests/FileStream/ctor_options.cs
@@ -0,0 +1,172 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Linq;
+using System.Security.Cryptography;
+using Xunit;
+
+namespace System.IO.Tests
+{
+ // Don't run in parallel as the WhenDiskIsFullTheErrorMessageContainsAllDetails test
+ // consumes entire available free space on the disk (only on Linux, this is how fallocate works)
+ // and if we try to run other disk-writing test in the meantime we are going to get "No space left on device" exception.
+ [Collection("NoParallelTests")]
+ public partial class FileStream_ctor_options : FileStream_ctor_str_fm_fa_fs_buffer_fo
+ {
+ protected override string GetExpectedParamName(string paramName) => "value";
+
+ protected override FileStream CreateFileStream(string path, FileMode mode)
+ => new FileStream(path,
+ new FileStreamOptions
+ {
+ Mode = mode,
+ Access = mode == FileMode.Append ? FileAccess.Write : FileAccess.ReadWrite
+ });
+
+ protected override FileStream CreateFileStream(string path, FileMode mode, FileAccess access)
+ => new FileStream(path,
+ new FileStreamOptions
+ {
+ Mode = mode,
+ Access = access
+ });
+
+ protected override FileStream CreateFileStream(string path, FileMode mode, FileAccess access, FileShare share, int bufferSize, FileOptions options)
+ => new FileStream(path,
+ new FileStreamOptions
+ {
+ Mode = mode,
+ Access = access,
+ Share = share,
+ BufferSize = bufferSize,
+ Options = options
+ });
+
+ protected virtual FileStream CreateFileStream(string path, FileMode mode, FileAccess access, FileShare share, int bufferSize, FileOptions options, long preallocationSize)
+ => new FileStream(path,
+ new FileStreamOptions
+ {
+ Mode = mode,
+ Access = access,
+ Share = share,
+ BufferSize = bufferSize,
+ Options = options,
+ PreallocationSize = preallocationSize
+ });
+
+ [Fact]
+ public virtual void NegativePreallocationSizeThrows()
+ {
+ string filePath = GetTestFilePath();
+ ArgumentOutOfRangeException ex = Assert.Throws(
+ () => CreateFileStream(filePath, FileMode.CreateNew, FileAccess.Write, FileShare.None, bufferSize: 1, FileOptions.None, preallocationSize: -1));
+ }
+
+ [Theory]
+ [InlineData(FileMode.Append)]
+ [InlineData(FileMode.Open)]
+ [InlineData(FileMode.OpenOrCreate)]
+ [InlineData(FileMode.Truncate)]
+ public void PreallocationSizeThrowsForFileModesThatOpenExistingFiles(FileMode mode)
+ {
+ Assert.Throws(
+ () => CreateFileStream(GetTestFilePath(), mode, FileAccess.Write, FileShare.None, bufferSize: 1, FileOptions.None, preallocationSize: 20));
+ }
+
+ [Theory]
+ [InlineData(FileMode.Create)]
+ [InlineData(FileMode.CreateNew)]
+ public void PreallocationSizeThrowsForReadOnlyAccess(FileMode mode)
+ {
+ Assert.Throws(
+ () => CreateFileStream(GetTestFilePath(), mode, FileAccess.Read, FileShare.None, bufferSize: 1, FileOptions.None, preallocationSize: 20));
+ }
+
+ [Theory]
+ [InlineData(FileMode.Create, false)]
+ [InlineData(FileMode.Create, true)]
+ [InlineData(FileMode.CreateNew, false)]
+ [InlineData(FileMode.Append, false)]
+ [InlineData(FileMode.Append, true)]
+ [InlineData(FileMode.Open, true)]
+ [InlineData(FileMode.OpenOrCreate, true)]
+ [InlineData(FileMode.OpenOrCreate, false)]
+ [InlineData(FileMode.Truncate, true)]
+ public void ZeroPreallocationSizeDoesNotAllocate(FileMode mode, bool createFile)
+ {
+ string filename = GetTestFilePath();
+
+ if (createFile)
+ {
+ File.WriteAllText(filename, "");
+ }
+
+ using (FileStream fs = CreateFileStream(filename, mode, FileAccess.Write, FileShare.None, bufferSize: 1, FileOptions.None, preallocationSize: 0))
+ {
+ Assert.Equal(0, fs.Length);
+ if (IsGetAllocatedSizeImplemented)
+ {
+ Assert.Equal(0, GetAllocatedSize(fs));
+ }
+ Assert.Equal(0, fs.Position);
+ }
+ }
+
+ [Theory]
+ [InlineData(FileAccess.Write, FileMode.Create)]
+ [InlineData(FileAccess.Write, FileMode.CreateNew)]
+ [InlineData(FileAccess.ReadWrite, FileMode.Create)]
+ [InlineData(FileAccess.ReadWrite, FileMode.CreateNew)]
+ public void PreallocationSize(FileAccess access, FileMode mode)
+ {
+ const long preallocationSize = 123;
+
+ using (var fs = CreateFileStream(GetTestFilePath(), mode, access, FileShare.None, bufferSize: 1, FileOptions.None, preallocationSize))
+ {
+ Assert.Equal(0, fs.Length);
+ if (IsGetAllocatedSizeImplemented)
+ {
+ if (SupportsPreallocation)
+ {
+ Assert.True(GetAllocatedSize(fs) >= preallocationSize);
+ }
+ else
+ {
+ Assert.Equal(0, GetAllocatedSize(fs));
+ }
+ }
+ Assert.Equal(0, fs.Position);
+ }
+ }
+
+ [OuterLoop("Might allocate 1 TB file if there is enough space on the disk")]
+ // macOS fcntl doc does not mention ENOSPC error: https://developer.apple.com/library/archive/documentation/System/Conceptual/ManPages_iPhoneOS/man2/fcntl.2.html
+ // But depending on the OS version, it might actually return it.
+ // Since we don't want to have unstable tests, it's better to not run it on macOS at all.
+ [PlatformSpecific(TestPlatforms.Windows | TestPlatforms.Linux)]
+ [Theory]
+ [InlineData(FileMode.Create)]
+ [InlineData(FileMode.CreateNew)]
+ public void WhenDiskIsFullTheErrorMessageContainsAllDetails(FileMode mode)
+ {
+ const long TooMuch = 1024L * 1024L * 1024L * 1024L; // 1 TB
+
+ string filePath = GetTestFilePath();
+
+ IOException ex = Assert.Throws(() => CreateFileStream(filePath, mode, FileAccess.Write, FileShare.None, bufferSize: 1, FileOptions.None, TooMuch));
+ Assert.Contains(filePath, ex.Message);
+ Assert.Contains(TooMuch.ToString(), ex.Message);
+
+ // ensure it was NOT created
+ bool exists = File.Exists(filePath);
+ if (exists)
+ {
+ File.Delete(filePath);
+ }
+ Assert.False(exists);
+ }
+ }
+
+ [CollectionDefinition("NoParallelTests", DisableParallelization = true)]
+ public partial class NoParallelTests { }
+}
diff --git a/src/libraries/System.IO.FileSystem/tests/FileStream/ctor_options_as.Browser.cs b/src/libraries/System.IO.FileSystem/tests/FileStream/ctor_options_as.Browser.cs
deleted file mode 100644
index 3475c8999ca6f9..00000000000000
--- a/src/libraries/System.IO.FileSystem/tests/FileStream/ctor_options_as.Browser.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-namespace System.IO.Tests
-{
- public partial class FileStream_ctor_options_as : FileStream_ctor_options_as_base
- {
- protected override long PreallocationSize => 10;
-
- protected override long InitialLength => 10;
-
- private long GetExpectedFileLength(long preallocationSize) => preallocationSize;
-
- private long GetActualPreallocationSize(FileStream fileStream) => fileStream.Length;
- }
-}
diff --git a/src/libraries/System.IO.FileSystem/tests/FileStream/ctor_options_as.Unix.cs b/src/libraries/System.IO.FileSystem/tests/FileStream/ctor_options_as.Unix.cs
deleted file mode 100644
index 12e8f1641bac00..00000000000000
--- a/src/libraries/System.IO.FileSystem/tests/FileStream/ctor_options_as.Unix.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-namespace System.IO.Tests
-{
- public partial class FileStream_ctor_options_as : FileStream_ctor_options_as_base
- {
- protected override long PreallocationSize => 10;
-
- protected override long InitialLength => 10;
-
- private long GetExpectedFileLength(long preallocationSize) => preallocationSize;
-
- private long GetActualPreallocationSize(FileStream fileStream)
- {
- // On Unix posix_fallocate modifies file length and we are using fstat to get it for verificaiton
- Interop.Sys.FStat(fileStream.SafeFileHandle, out Interop.Sys.FileStatus fileStatus);
- return fileStatus.Size;
- }
- }
-}
diff --git a/src/libraries/System.IO.FileSystem/tests/FileStream/ctor_options_as.cs b/src/libraries/System.IO.FileSystem/tests/FileStream/ctor_options_as.cs
deleted file mode 100644
index f36e55ea16d2de..00000000000000
--- a/src/libraries/System.IO.FileSystem/tests/FileStream/ctor_options_as.cs
+++ /dev/null
@@ -1,212 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-using Xunit;
-
-namespace System.IO.Tests
-{
- public abstract class FileStream_ctor_options_as_base : FileStream_ctor_str_fm_fa_fs_buffer_fo
- {
- protected abstract long PreallocationSize { get; }
-
- protected override string GetExpectedParamName(string paramName) => "value";
-
- protected override FileStream CreateFileStream(string path, FileMode mode)
- => new FileStream(path,
- new FileStreamOptions
- {
- Mode = mode,
- Access = mode == FileMode.Append ? FileAccess.Write : FileAccess.ReadWrite,
- PreallocationSize = PreallocationSize
- });
-
- protected override FileStream CreateFileStream(string path, FileMode mode, FileAccess access)
- => new FileStream(path,
- new FileStreamOptions
- {
- Mode = mode,
- Access = access,
- PreallocationSize = PreallocationSize
- });
-
- protected override FileStream CreateFileStream(string path, FileMode mode, FileAccess access, FileShare share, int bufferSize, FileOptions options)
- => new FileStream(path,
- new FileStreamOptions
- {
- Mode = mode,
- Access = access,
- Share = share,
- BufferSize = bufferSize,
- Options = options,
- PreallocationSize = PreallocationSize
- });
-
- protected FileStreamOptions GetOptions(FileMode mode, FileAccess access, FileShare share, FileOptions options, long preAllocationSize)
- => new FileStreamOptions
- {
- Mode = mode,
- Access = access,
- Share = share,
- Options = options,
- PreallocationSize = preAllocationSize
- };
- }
-
- public class FileStream_ctor_options_as_zero : FileStream_ctor_options_as_base
- {
- protected override long PreallocationSize => 0; // specifying 0 should have no effect
-
- protected override long InitialLength => 0;
- }
-
- [CollectionDefinition("NoParallelTests", DisableParallelization = true)]
- public partial class NoParallelTests { }
-
- // Don't run in parallel as the WhenDiskIsFullTheErrorMessageContainsAllDetails test
- // consumes entire available free space on the disk (only on Linux, this is how posix_fallocate works)
- // and if we try to run other disk-writing test in the meantime we are going to get "No space left on device" exception.
- [Collection("NoParallelTests")]
- public partial class FileStream_ctor_options_as : FileStream_ctor_options_as_base
- {
- [Fact]
- public virtual void NegativePreallocationSizeThrows()
- {
- string filePath = GetPathToNonExistingFile();
- ArgumentOutOfRangeException ex = Assert.Throws(
- () => new FileStream(filePath, GetOptions(FileMode.CreateNew, FileAccess.Write, FileShare.None, FileOptions.None, -1)));
- }
-
- [Theory]
- [InlineData(FileMode.Create, 0L)]
- [InlineData(FileMode.CreateNew, 0L)]
- [InlineData(FileMode.OpenOrCreate, 0L)]
- public void WhenFileIsCreatedWithoutPreallocationSizeSpecifiedThePreallocationSizeIsNotSet(FileMode mode, long preallocationSize)
- {
- using (var fs = new FileStream(GetPathToNonExistingFile(), GetOptions(mode, FileAccess.Write, FileShare.None, FileOptions.None, preallocationSize)))
- {
- Assert.Equal(0, GetActualPreallocationSize(fs));
- Assert.Equal(0, fs.Length);
- Assert.Equal(0, fs.Position);
- }
- }
-
- [Theory]
- [InlineData(FileMode.Open, 0L)]
- [InlineData(FileMode.Open, 1L)]
- [InlineData(FileMode.OpenOrCreate, 0L)]
- [InlineData(FileMode.OpenOrCreate, 1L)]
- [InlineData(FileMode.Append, 0L)]
- [InlineData(FileMode.Append, 1L)]
- public void WhenExistingFileIsBeingOpenedWithPreallocationSizeSpecifiedThePreallocationSizeIsNotChanged(FileMode mode, long preallocationSize)
- {
- const int initialSize = 1;
- string filePath = GetPathToNonExistingFile();
- File.WriteAllBytes(filePath, new byte[initialSize]);
- long initialPreallocationSize;
-
- using (var fs = new FileStream(filePath, GetOptions(mode, FileAccess.Write, FileShare.None, FileOptions.None, 0))) // preallocationSize NOT provided
- {
- initialPreallocationSize = GetActualPreallocationSize(fs); // just read it to ensure it's not being changed
- }
-
- using (var fs = new FileStream(filePath, GetOptions(mode, FileAccess.Write, FileShare.None, FileOptions.None, preallocationSize)))
- {
- Assert.Equal(initialPreallocationSize, GetActualPreallocationSize(fs)); // it has NOT been changed
- Assert.Equal(initialSize, fs.Length);
- Assert.Equal(mode == FileMode.Append ? initialSize : 0, fs.Position);
- }
- }
-
- [Theory]
- [InlineData(FileMode.Create)]
- [InlineData(FileMode.CreateNew)]
- [InlineData(FileMode.OpenOrCreate)]
- public void WhenFileIsCreatedWithPreallocationSizeSpecifiedThePreallocationSizeIsSet(FileMode mode)
- {
- const long preallocationSize = 123;
-
- using (var fs = new FileStream(GetPathToNonExistingFile(), GetOptions(mode, FileAccess.Write, FileShare.None, FileOptions.None, preallocationSize)))
- {
- // OS might allocate MORE than we have requested
- Assert.True(GetActualPreallocationSize(fs) >= preallocationSize, $"Provided {preallocationSize}, actual: {GetActualPreallocationSize(fs)}");
- Assert.Equal(GetExpectedFileLength(preallocationSize), fs.Length);
- Assert.Equal(0, fs.Position);
- }
- }
-
- [OuterLoop("Might allocate 1 TB file if there is enough space on the disk")]
- // macOS fcntl doc does not mention ENOSPC error: https://developer.apple.com/library/archive/documentation/System/Conceptual/ManPages_iPhoneOS/man2/fcntl.2.html
- // But depending on the OS version, it might actually return it.
- // Since we don't want to have unstable tests, it's better to not run it on macOS at all.
- [PlatformSpecific(TestPlatforms.Windows | TestPlatforms.Linux)]
- [Theory]
- [InlineData(FileMode.Create)]
- [InlineData(FileMode.CreateNew)]
- [InlineData(FileMode.OpenOrCreate)]
- public void WhenDiskIsFullTheErrorMessageContainsAllDetails(FileMode mode)
- {
- const long tooMuch = 1024L * 1024L * 1024L * 1024L; // 1 TB
-
- string filePath = GetPathToNonExistingFile();
-
- IOException ex = Assert.Throws(() => new FileStream(filePath, GetOptions(mode, FileAccess.Write, FileShare.None, FileOptions.None, tooMuch)));
- Assert.Contains(filePath, ex.Message);
- Assert.Contains(tooMuch.ToString(), ex.Message);
-
- // ensure it was NOT created (provided OOTB by Windows, emulated on Unix)
- bool exists = File.Exists(filePath);
- if (exists)
- {
- File.Delete(filePath);
- }
- Assert.False(exists);
- }
-
- [Fact]
- public void WhenFileIsTruncatedWithoutPreallocationSizeSpecifiedThePreallocationSizeIsNotSet()
- {
- const int initialSize = 10_000;
-
- string filePath = GetPathToNonExistingFile();
- File.WriteAllBytes(filePath, new byte[initialSize]);
-
- using (var fs = new FileStream(filePath, GetOptions(FileMode.Truncate, FileAccess.Write, FileShare.None, FileOptions.None, 0)))
- {
- Assert.Equal(0, GetActualPreallocationSize(fs));
- Assert.Equal(0, fs.Length);
- Assert.Equal(0, fs.Position);
- }
- }
-
- [Fact]
- public void WhenFileIsTruncatedWithPreallocationSizeSpecifiedThePreallocationSizeIsSet()
- {
- const int initialSize = 10_000; // this must be more than 4kb which seems to be minimum allocation size on Windows
- const long preallocationSize = 100;
-
- string filePath = GetPathToNonExistingFile();
- File.WriteAllBytes(filePath, new byte[initialSize]);
-
- using (var fs = new FileStream(filePath, GetOptions(FileMode.Truncate, FileAccess.Write, FileShare.None, FileOptions.None, preallocationSize)))
- {
- Assert.True(GetActualPreallocationSize(fs) >= preallocationSize, $"Provided {preallocationSize}, actual: {GetActualPreallocationSize(fs)}");
- // less than initial file size (file got truncated)
- Assert.True(GetActualPreallocationSize(fs) < initialSize, $"initialSize {initialSize}, actual: {GetActualPreallocationSize(fs)}");
- Assert.Equal(GetExpectedFileLength(preallocationSize), fs.Length);
- Assert.Equal(0, fs.Position);
- }
- }
-
- private string GetPathToNonExistingFile()
- {
- string filePath = GetTestFilePath();
-
- if (File.Exists(filePath))
- {
- File.Delete(filePath);
- }
-
- return filePath;
- }
- }
-}
diff --git a/src/libraries/System.IO.FileSystem/tests/FileStream/ctor_str_fm.cs b/src/libraries/System.IO.FileSystem/tests/FileStream/ctor_str_fm.cs
index 47e3b492373161..cd3b18da034228 100644
--- a/src/libraries/System.IO.FileSystem/tests/FileStream/ctor_str_fm.cs
+++ b/src/libraries/System.IO.FileSystem/tests/FileStream/ctor_str_fm.cs
@@ -13,8 +13,6 @@ protected virtual FileStream CreateFileStream(string path, FileMode mode)
return new FileStream(path, mode);
}
- protected virtual long InitialLength => 0;
-
protected virtual string GetExpectedParamName(string paramName) => paramName;
[Fact]
@@ -97,7 +95,7 @@ public void FileModeCreateExisting(string streamSpecifier)
using (FileStream fs = CreateFileStream(fileName, FileMode.Create))
{
// Ensure that the file was re-created
- Assert.Equal(InitialLength, fs.Length);
+ Assert.Equal(0, fs.Length);
Assert.Equal(0L, fs.Position);
Assert.True(fs.CanRead);
Assert.True(fs.CanWrite);
@@ -148,7 +146,7 @@ public void FileModeOpenExisting(string streamSpecifier)
using (FileStream fs = CreateFileStream(fileName, FileMode.Open))
{
// Ensure that the file was re-opened
- Assert.Equal(Math.Max(1L, InitialLength), fs.Length);
+ Assert.Equal(1, fs.Length);
Assert.Equal(0L, fs.Position);
Assert.True(fs.CanRead);
Assert.True(fs.CanWrite);
@@ -177,7 +175,7 @@ public void FileModeOpenOrCreateExisting(string streamSpecifier)
using (FileStream fs = CreateFileStream(fileName, FileMode.OpenOrCreate))
{
// Ensure that the file was re-opened
- Assert.Equal(Math.Max(1L, InitialLength), fs.Length);
+ Assert.Equal(1, fs.Length);
Assert.Equal(0L, fs.Position);
Assert.True(fs.CanRead);
Assert.True(fs.CanWrite);
@@ -204,7 +202,7 @@ public void FileModeTruncateExisting(string streamSpecifier)
using (FileStream fs = CreateFileStream(fileName, FileMode.Truncate))
{
// Ensure that the file was re-opened and truncated
- Assert.Equal(InitialLength, fs.Length);
+ Assert.Equal(0, fs.Length);
Assert.Equal(0L, fs.Position);
Assert.True(fs.CanRead);
Assert.True(fs.CanWrite);
@@ -246,7 +244,7 @@ public virtual void FileModeAppendExisting(string streamSpecifier)
using (FileStream fs = CreateFileStream(fileName, FileMode.Append))
{
// Ensure that the file was re-opened and position set to end
- Assert.Equal(Math.Max(1L, InitialLength), fs.Length);
+ Assert.Equal(1, fs.Length);
long position = fs.Position;
Assert.Equal(fs.Length, position);
diff --git a/src/libraries/System.IO.FileSystem/tests/Junctions.Windows.cs b/src/libraries/System.IO.FileSystem/tests/Junctions.Windows.cs
new file mode 100644
index 00000000000000..c280008148977a
--- /dev/null
+++ b/src/libraries/System.IO.FileSystem/tests/Junctions.Windows.cs
@@ -0,0 +1,107 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using Xunit;
+
+namespace System.IO.Tests
+{
+ [PlatformSpecific(TestPlatforms.Windows)]
+ public class Junctions : BaseSymbolicLinks
+ {
+ private DirectoryInfo CreateJunction(string junctionPath, string targetPath)
+ {
+ Assert.True(MountHelper.CreateJunction(junctionPath, targetPath));
+ DirectoryInfo junctionInfo = new(junctionPath);
+ return junctionInfo;
+ }
+
+ [Theory]
+ [InlineData(false)]
+ [InlineData(true)]
+ public void Junction_ResolveLinkTarget(bool returnFinalTarget)
+ {
+ string junctionPath = GetRandomLinkPath();
+ string targetPath = GetRandomDirPath();
+
+ Directory.CreateDirectory(targetPath);
+ DirectoryInfo junctionInfo = CreateJunction(junctionPath, targetPath);
+
+ FileSystemInfo? targetFromDirectoryInfo = junctionInfo.ResolveLinkTarget(returnFinalTarget);
+ FileSystemInfo? targetFromDirectory = Directory.ResolveLinkTarget(junctionPath, returnFinalTarget);
+
+ Assert.True(targetFromDirectoryInfo is DirectoryInfo);
+ Assert.True(targetFromDirectory is DirectoryInfo);
+
+ Assert.Equal(targetPath, junctionInfo.LinkTarget);
+
+ Assert.Equal(targetPath, targetFromDirectoryInfo.FullName);
+ Assert.Equal(targetPath, targetFromDirectory.FullName);
+ }
+
+ [Theory]
+ [InlineData(false)]
+ [InlineData(true)]
+ public void Junction_ResolveLinkTarget_WithIndirection(bool returnFinalTarget)
+ {
+ string firstJunctionPath = GetRandomLinkPath();
+ string middleJunctionPath = GetRandomLinkPath();
+ string targetPath = GetRandomDirPath();
+
+ Directory.CreateDirectory(targetPath);
+ CreateJunction(middleJunctionPath, targetPath);
+ DirectoryInfo firstJunctionInfo = CreateJunction(firstJunctionPath, middleJunctionPath);
+
+ string expectedTargetPath = returnFinalTarget ? targetPath : middleJunctionPath;
+
+ FileSystemInfo? targetFromDirectoryInfo = firstJunctionInfo.ResolveLinkTarget(returnFinalTarget);
+ FileSystemInfo? targetFromDirectory = Directory.ResolveLinkTarget(firstJunctionPath, returnFinalTarget);
+
+ Assert.True(targetFromDirectoryInfo is DirectoryInfo);
+ Assert.True(targetFromDirectory is DirectoryInfo);
+
+ // Always the immediate target
+ Assert.Equal(middleJunctionPath, firstJunctionInfo.LinkTarget);
+
+ Assert.Equal(expectedTargetPath, targetFromDirectoryInfo.FullName);
+ Assert.Equal(expectedTargetPath, targetFromDirectory.FullName);
+ }
+
+ [Theory]
+ [MemberData(nameof(Junction_ResolveLinkTarget_PathToTarget_Data))]
+ public void Junction_ResolveLinkTarget_Succeeds(string pathToTarget, bool returnFinalTarget)
+ {
+ string linkPath = GetRandomLinkPath();
+ FileSystemInfo linkInfo = CreateJunction(linkPath, pathToTarget);
+
+ // Junctions are always created with absolute targets, even if a relative path is passed.
+ string expectedTarget = Path.GetFullPath(pathToTarget);
+
+ Assert.True(linkInfo.Exists);
+ Assert.IsType(linkInfo);
+ Assert.True(linkInfo.Attributes.HasFlag(FileAttributes.Directory));
+ Assert.Equal(expectedTarget, linkInfo.LinkTarget);
+
+ FileSystemInfo? targetFromDirectoryInfo = linkInfo.ResolveLinkTarget(returnFinalTarget);
+ FileSystemInfo? targetFromDirectory = Directory.ResolveLinkTarget(linkPath, returnFinalTarget);
+
+ Assert.NotNull(targetFromDirectoryInfo);
+ Assert.NotNull(targetFromDirectory);
+
+ Assert.False(targetFromDirectoryInfo.Exists);
+ Assert.False(targetFromDirectory.Exists);
+
+
+ Assert.Equal(expectedTarget, targetFromDirectoryInfo.FullName);
+ Assert.Equal(expectedTarget, targetFromDirectory.FullName);
+ }
+
+ [Theory]
+ [MemberData(nameof(Junction_LinkTarget_PathToTarget_Data))]
+ public void Junction_LinkTarget_Succeeds(string pathToTarget)
+ {
+ FileSystemInfo linkInfo = CreateJunction(GetRandomLinkPath(), pathToTarget);
+ Assert.True(linkInfo.Exists);
+ Assert.Equal(Path.GetFullPath(pathToTarget), linkInfo.LinkTarget);
+ }
+ }
+}
diff --git a/src/libraries/System.IO.FileSystem/tests/LargeFileTests.cs b/src/libraries/System.IO.FileSystem/tests/LargeFileTests.cs
new file mode 100644
index 00000000000000..c8158f8b97784a
--- /dev/null
+++ b/src/libraries/System.IO.FileSystem/tests/LargeFileTests.cs
@@ -0,0 +1,64 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.IO.Tests;
+using System.Threading.Tasks;
+using Xunit;
+
+namespace System.IO.FileSystem.Tests
+{
+ [OuterLoop]
+ [ActiveIssue("https://github.com/dotnet/runtime/issues/45954", TestPlatforms.Browser)]
+ [Collection(nameof(NoParallelTests))] // don't create multiple large files at the same time
+ public class LargeFileTests : FileSystemTest
+ {
+ [Fact]
+ public async Task ReadAllBytesOverLimit()
+ {
+ using FileStream fs = new (GetTestFilePath(), FileMode.Create, FileAccess.Write, FileShare.Read, 4096, FileOptions.DeleteOnClose);
+
+ foreach (long lengthOverLimit in new long[] { int.MaxValue + 1L })
+ {
+ fs.SetLength(lengthOverLimit);
+
+ Assert.Throws(() => File.ReadAllBytes(fs.Name));
+ await Assert.ThrowsAsync(async () => await File.ReadAllBytesAsync(fs.Name));
+ }
+ }
+
+ [Fact]
+ public void NoInt32OverflowInTheBufferingLogic()
+ {
+ const long position1 = 10;
+ const long position2 = (1L << 32) + position1;
+
+ string filePath = GetTestFilePath();
+ byte[] data1 = new byte[] { 1, 2, 3, 4, 5 };
+ byte[] data2 = new byte[] { 6, 7, 8, 9, 10 };
+ byte[] buffer = new byte[5];
+
+ using (FileStream stream = File.Create(filePath))
+ {
+ stream.Seek(position1, SeekOrigin.Begin);
+ stream.Write(data1);
+
+ stream.Seek(position2, SeekOrigin.Begin);
+ stream.Write(data2);
+ }
+
+ using (FileStream stream = new (filePath, FileMode.Open, FileAccess.Read, FileShare.None, 4096, FileOptions.DeleteOnClose))
+ {
+ stream.Seek(position1, SeekOrigin.Begin);
+ Assert.Equal(buffer.Length, stream.Read(buffer));
+ Assert.Equal(data1, buffer);
+
+ stream.Seek(position2, SeekOrigin.Begin);
+ Assert.Equal(buffer.Length, stream.Read(buffer));
+ Assert.Equal(data2, buffer);
+ }
+ }
+ }
+
+ [CollectionDefinition(nameof(NoParallelTests), DisableParallelization = true)]
+ public partial class NoParallelTests { }
+}
diff --git a/src/libraries/System.IO.FileSystem/tests/Net5CompatTests/System.IO.FileSystem.Net5Compat.Tests.csproj b/src/libraries/System.IO.FileSystem/tests/Net5CompatTests/System.IO.FileSystem.Net5Compat.Tests.csproj
index 745ff60368b2ef..385c3afb569c49 100644
--- a/src/libraries/System.IO.FileSystem/tests/Net5CompatTests/System.IO.FileSystem.Net5Compat.Tests.csproj
+++ b/src/libraries/System.IO.FileSystem/tests/Net5CompatTests/System.IO.FileSystem.Net5Compat.Tests.csproj
@@ -1,4 +1,4 @@
-
+
true
true
@@ -14,7 +14,6 @@
-
@@ -33,6 +32,7 @@
+
diff --git a/src/libraries/System.IO.FileSystem/tests/PortedCommon/ReparsePointUtilities.cs b/src/libraries/System.IO.FileSystem/tests/PortedCommon/ReparsePointUtilities.cs
index 5423bda6814b3b..8c7f3608d35ce2 100644
--- a/src/libraries/System.IO.FileSystem/tests/PortedCommon/ReparsePointUtilities.cs
+++ b/src/libraries/System.IO.FileSystem/tests/PortedCommon/ReparsePointUtilities.cs
@@ -10,14 +10,14 @@
#define DEBUG
using System;
-using System.IO;
-using System.Text;
-using System.Diagnostics;
using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
+using System.Linq;
using System.Runtime.InteropServices;
-using System.ComponentModel;
-using System.Threading;
+using System.Text;
using System.Threading.Tasks;
+
public static class MountHelper
{
[DllImport("kernel32.dll", EntryPoint = "GetVolumeNameForVolumeMountPointW", CharSet = CharSet.Unicode, BestFitMapping = false, SetLastError = true)]
@@ -28,9 +28,7 @@ public static class MountHelper
[DllImport("kernel32.dll", EntryPoint = "DeleteVolumeMountPointW", CharSet = CharSet.Unicode, BestFitMapping = false, SetLastError = true)]
private static extern bool DeleteVolumeMountPoint(string mountPoint);
- /// Creates a symbolic link using command line tools
- /// The existing file
- ///
+ /// Creates a symbolic link using command line tools.
public static bool CreateSymbolicLink(string linkPath, string targetPath, bool isDirectory)
{
Process symLinkProcess = new Process();
@@ -48,20 +46,78 @@ public static bool CreateSymbolicLink(string linkPath, string targetPath, bool i
symLinkProcess.StartInfo.RedirectStandardOutput = true;
symLinkProcess.Start();
- if (symLinkProcess != null)
+ symLinkProcess.WaitForExit();
+ return symLinkProcess.ExitCode == 0;
+ }
+
+ /// On Windows, creates a junction using command line tools.
+ public static bool CreateJunction(string junctionPath, string targetPath)
+ {
+ if (!OperatingSystem.IsWindows())
{
- symLinkProcess.WaitForExit();
- return (0 == symLinkProcess.ExitCode);
+ throw new PlatformNotSupportedException();
}
- else
+
+ return RunProcess(CreateProcessStartInfo("cmd", "/c", "mklink", "/J", junctionPath, targetPath));
+ }
+
+ ///
+ /// On Windows, mounts a folder to an assigned virtual drive letter using the subst command.
+ /// subst is not available in Windows Nano.
+ ///
+ public static char CreateVirtualDrive(string targetDir)
+ {
+ if (!OperatingSystem.IsWindows())
+ {
+ throw new PlatformNotSupportedException();
+ }
+
+ char driveLetter = GetNextAvailableDriveLetter();
+ bool success = RunProcess(CreateProcessStartInfo("cmd", "/c", SubstPath, $"{driveLetter}:", targetDir));
+ if (!success || !DriveInfo.GetDrives().Any(x => x.Name[0] == driveLetter))
+ {
+ throw new InvalidOperationException($"Could not create virtual drive {driveLetter}: with subst");
+ }
+ return driveLetter;
+
+ // Finds the next unused drive letter and returns it.
+ char GetNextAvailableDriveLetter()
{
- return false;
+ List existingDrives = DriveInfo.GetDrives().Select(x => x.Name[0]).ToList();
+
+ // A,B are reserved, C is usually reserved
+ IEnumerable range = Enumerable.Range('D', 'Z' - 'D');
+ IEnumerable castRange = range.Select(x => Convert.ToChar(x));
+ IEnumerable allDrivesLetters = castRange.Except(existingDrives);
+
+ if (!allDrivesLetters.Any())
+ {
+ throw new ArgumentOutOfRangeException("No drive letters available");
+ }
+
+ return allDrivesLetters.First();
}
}
- public static void Mount(string volumeName, string mountPoint)
+ ///
+ /// On Windows, unassigns the specified virtual drive letter from its mounted folder.
+ ///
+ public static void DeleteVirtualDrive(char driveLetter)
{
+ if (!OperatingSystem.IsWindows())
+ {
+ throw new PlatformNotSupportedException();
+ }
+ bool success = RunProcess(CreateProcessStartInfo("cmd", "/c", SubstPath, "/d", $"{driveLetter}:"));
+ if (!success || DriveInfo.GetDrives().Any(x => x.Name[0] == driveLetter))
+ {
+ throw new InvalidOperationException($"Could not delete virtual drive {driveLetter}: with subst");
+ }
+ }
+
+ public static void Mount(string volumeName, string mountPoint)
+ {
if (volumeName[volumeName.Length - 1] != Path.DirectorySeparatorChar)
volumeName += Path.DirectorySeparatorChar;
if (mountPoint[mountPoint.Length - 1] != Path.DirectorySeparatorChar)
@@ -93,8 +149,47 @@ public static void Unmount(string mountPoint)
throw new Exception(string.Format("Win32 error: {0}", Marshal.GetLastPInvokeError()));
}
+ private static ProcessStartInfo CreateProcessStartInfo(string fileName, params string[] arguments)
+ {
+ var info = new ProcessStartInfo
+ {
+ FileName = fileName,
+ UseShellExecute = false,
+ RedirectStandardOutput = true
+ };
+
+ foreach (var argument in arguments)
+ {
+ info.ArgumentList.Add(argument);
+ }
+
+ return info;
+ }
+
+ private static bool RunProcess(ProcessStartInfo startInfo)
+ {
+ var process = Process.Start(startInfo);
+ process.WaitForExit();
+ return process.ExitCode == 0;
+ }
+
+ private static string SubstPath
+ {
+ get
+ {
+ if (!OperatingSystem.IsWindows())
+ {
+ throw new PlatformNotSupportedException();
+ }
+
+ string systemRoot = Environment.GetEnvironmentVariable("SystemRoot") ?? @"C:\Windows";
+ string system32 = Path.Join(systemRoot, "System32");
+ return Path.Join(system32, "subst.exe");
+ }
+ }
+
/// For standalone debugging help. Change Main0 to Main
- public static void Main0(string[] args)
+ public static void Main0(string[] args)
{
try
{
diff --git a/src/libraries/System.IO.FileSystem/tests/RandomAccess/NoBuffering.Windows.cs b/src/libraries/System.IO.FileSystem/tests/RandomAccess/NoBuffering.Windows.cs
index d897cc7b8be25b..bde3863d5b1df9 100644
--- a/src/libraries/System.IO.FileSystem/tests/RandomAccess/NoBuffering.Windows.cs
+++ b/src/libraries/System.IO.FileSystem/tests/RandomAccess/NoBuffering.Windows.cs
@@ -176,5 +176,47 @@ public async Task WriteAsyncUsingMultipleBuffers(bool async)
Assert.Equal(content, File.ReadAllBytes(filePath));
}
+
+ [Theory]
+ [InlineData(true)]
+ [InlineData(false)]
+ public async Task ReadWriteAsyncUsingMultipleBuffers(bool memoryPageSized)
+ {
+ string filePath = GetTestFilePath();
+ // We test with buffers both one and two memory pages long. In the former case,
+ // the I/O operations will issue one scatter/gather API call, and in the latter
+ // case they will issue multiple calls; one per buffer. The buffers must still
+ // be aligned to comply with FILE_FLAG_NO_BUFFERING's requirements.
+ int bufferSize = Environment.SystemPageSize * (memoryPageSized ? 1 : 2);
+ int fileSize = bufferSize * 2;
+ byte[] content = RandomNumberGenerator.GetBytes(fileSize);
+
+ using (SafeFileHandle handle = File.OpenHandle(filePath, FileMode.CreateNew, FileAccess.ReadWrite, FileShare.None, FileOptions.Asynchronous | NoBuffering))
+ using (SectorAlignedMemory buffer = SectorAlignedMemory.Allocate(fileSize))
+ {
+ Memory firstHalf = buffer.Memory.Slice(0, bufferSize);
+ Memory secondHalf = buffer.Memory.Slice(bufferSize);
+
+ content.AsSpan().CopyTo(buffer.GetSpan());
+ await RandomAccess.WriteAsync(handle, new ReadOnlyMemory[] { firstHalf, secondHalf }, 0);
+
+ buffer.GetSpan().Clear();
+ long nRead = await RandomAccess.ReadAsync(handle, new Memory[] { firstHalf, secondHalf }, 0);
+
+ Assert.Equal(buffer.GetSpan().Length, nRead);
+ AssertExtensions.SequenceEqual(buffer.GetSpan(), content.AsSpan());
+ }
+ }
+
+ [Fact]
+ public async Task ReadWriteAsyncUsingEmptyBuffers()
+ {
+ string filePath = GetTestFilePath();
+ using SafeFileHandle handle = File.OpenHandle(filePath, FileMode.CreateNew, FileAccess.ReadWrite, FileShare.None, FileOptions.Asynchronous | NoBuffering);
+
+ long nRead = await RandomAccess.ReadAsync(handle, Array.Empty>(), 0);
+ Assert.Equal(0, nRead);
+ await RandomAccess.WriteAsync(handle, Array.Empty>(), 0);
+ }
}
}
diff --git a/src/libraries/System.IO.FileSystem/tests/System.IO.FileSystem.Tests.csproj b/src/libraries/System.IO.FileSystem/tests/System.IO.FileSystem.Tests.csproj
index 736d3b1ee5654b..4c8fa1c23be5b8 100644
--- a/src/libraries/System.IO.FileSystem/tests/System.IO.FileSystem.Tests.csproj
+++ b/src/libraries/System.IO.FileSystem/tests/System.IO.FileSystem.Tests.csproj
@@ -1,4 +1,4 @@
-
+
true
true
@@ -24,7 +24,7 @@
-
+
@@ -55,6 +55,7 @@
+
@@ -70,19 +71,21 @@
-
-
+
+
-
+
+
+
@@ -101,7 +104,7 @@
-
+
@@ -117,6 +120,7 @@
+
@@ -211,8 +215,7 @@
-
+
diff --git a/src/libraries/System.IO.FileSystem/tests/VirtualDriveSymbolicLinks.Windows.cs b/src/libraries/System.IO.FileSystem/tests/VirtualDriveSymbolicLinks.Windows.cs
new file mode 100644
index 00000000000000..d88425086b7024
--- /dev/null
+++ b/src/libraries/System.IO.FileSystem/tests/VirtualDriveSymbolicLinks.Windows.cs
@@ -0,0 +1,247 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using Xunit;
+
+namespace System.IO.Tests
+{
+ // Need to reuse the same virtual drive for all the test methods.
+ // Creating and disposing one virtual drive per class achieves this.
+ [PlatformSpecific(TestPlatforms.Windows)]
+ [ConditionalClass(typeof(PlatformDetection), nameof(PlatformDetection.IsSubstAvailable))]
+ public class VirtualDrive_SymbolicLinks : BaseSymbolicLinks
+ {
+ protected override void Dispose(bool disposing)
+ {
+ try
+ {
+ if (VirtualDriveLetter != default)
+ {
+ MountHelper.DeleteVirtualDrive(VirtualDriveLetter);
+ Directory.Delete(VirtualDriveTargetDir, recursive: true);
+ }
+ }
+ catch { } // avoid exceptions on dispose
+ base.Dispose(disposing);
+ }
+
+ [Theory]
+ // false, false, false, false // Target is not in virtual drive
+ // false, false, true, false // Target is not in virtual drive
+ [InlineData(false, true, false, true)] // Immediate target expected, target is in virtual drive
+ [InlineData(false, true, true, false)] // Final target expected, target is in virtual drive
+ // true, false, false, false // Target is not in virtual drive
+ // true, false, true, false // Target is not in virtual drive
+ [InlineData(true, true, false, true)] // Immediate target expected, target is in virtual drive
+ [InlineData(true, true, true, false)] // Final target expected, target is in virtual drive
+ public void VirtualDrive_SymbolicLinks_LinkAndTarget(
+ bool isLinkInVirtualDrive,
+ bool isTargetInVirtualDrive,
+ bool returnFinalTarget,
+ bool isExpectedTargetPathVirtual)
+ {
+ string linkExpectedFolderPath = GetVirtualOrRealPath(isLinkInVirtualDrive);
+ // File link
+ string fileLinkName = GetRandomLinkName();
+ string fileLinkPath = Path.Join(linkExpectedFolderPath, fileLinkName);
+ // Directory link
+ string dirLinkName = GetRandomLinkName();
+ string dirLinkPath = Path.Join(linkExpectedFolderPath, dirLinkName);
+
+ string targetExpectedFolderPath = GetVirtualOrRealPath(isTargetInVirtualDrive);
+ // File target
+ string fileTargetFileName = GetRandomFileName();
+ string fileTargetPath = Path.Join(targetExpectedFolderPath, fileTargetFileName);
+ // Directory target
+ string dirTargetFileName = GetRandomDirName();
+ string dirTargetPath = Path.Join(targetExpectedFolderPath, dirTargetFileName);
+
+ // Create targets
+ File.Create(fileTargetPath).Dispose();
+ Directory.CreateDirectory(dirTargetPath);
+
+ // Create links
+ FileInfo fileLinkInfo = new FileInfo(fileLinkPath);
+ fileLinkInfo.CreateAsSymbolicLink(fileTargetPath);
+ DirectoryInfo dirLinkInfo = new DirectoryInfo(dirLinkPath);
+ dirLinkInfo.CreateAsSymbolicLink(dirTargetPath);
+
+ // The expected results depend on the target location and the value of returnFinalTarget
+
+ // LinkTarget always retrieves the immediate target, so the expected value
+ // is always the path that was provided by the user for the target
+
+ // Verify the LinkTarget values of the link infos
+ Assert.Equal(fileTargetPath, fileLinkInfo.LinkTarget);
+ Assert.Equal(dirTargetPath, dirLinkInfo.LinkTarget);
+
+ // When the target is in a virtual drive, and returnFinalTarget is true,
+ // the expected target path is the real path, not the virtual path
+ string expectedTargetPath = GetVirtualOrRealPath(isExpectedTargetPathVirtual);
+
+ string expectedTargetFileInfoFullName = Path.Join(expectedTargetPath, fileTargetFileName);
+ string expectedTargetDirectoryInfoFullName = Path.Join(expectedTargetPath, dirTargetFileName);
+
+ // Verify target infos from link info instances
+ FileSystemInfo? targetFileInfoFromFileInfoLink = fileLinkInfo.ResolveLinkTarget(returnFinalTarget);
+ FileSystemInfo? targetDirInfoFromDirInfoLink = dirLinkInfo.ResolveLinkTarget(returnFinalTarget);
+
+ Assert.True(targetFileInfoFromFileInfoLink is FileInfo);
+ Assert.True(targetDirInfoFromDirInfoLink is DirectoryInfo);
+
+ Assert.Equal(expectedTargetFileInfoFullName, targetFileInfoFromFileInfoLink.FullName);
+ Assert.Equal(expectedTargetDirectoryInfoFullName, targetDirInfoFromDirInfoLink.FullName);
+
+ // Verify targets infos via static methods
+ FileSystemInfo? targetFileInfoFromFile = File.ResolveLinkTarget(fileLinkPath, returnFinalTarget);
+ FileSystemInfo? targetFileInfoFromDirectory = Directory.ResolveLinkTarget(dirLinkPath, returnFinalTarget);
+
+ Assert.True(targetFileInfoFromFile is FileInfo);
+ Assert.True(targetFileInfoFromDirectory is DirectoryInfo);
+
+ Assert.Equal(expectedTargetFileInfoFullName, targetFileInfoFromFile.FullName);
+ Assert.Equal(expectedTargetDirectoryInfoFullName, targetFileInfoFromDirectory.FullName);
+ }
+
+
+ [Theory]
+ // false, false, false, false, false // Target is not in virtual drive
+ // false, false, false, true, false // Target is not in virtual drive
+ [InlineData(false, false, true, false, false)] // Immediate target expected, middle link is NOT in virtual drive
+ [InlineData(false, false, true, true, false)] // Final target expected, target is in virtual drive
+ // false, true, false, false, false // Target is not in virtual drive
+ // false, true, false, true, false // Target is not in virtual drive
+ [InlineData(false, true, true, false, true)] // Immediate target expected, target is in virtual drive
+ [InlineData(false, true, true, true, false)] // Final target expected, target is in virtual drive
+ // true, false, false, false, false // Target is not in virtual drive
+ // true, false, false, true, false // Target is not in virtual drive
+ [InlineData(true, false, true, false, false)] // Immediate target expected, middle link is NOT in virtual drive
+ [InlineData(true, false, true, true, false)] // Final target expected, target is in virtual drive
+ // true, true, false, false, false // Target is not in virtual drive
+ // true, true, false, true, false // Target is not in virtual drive
+ [InlineData(true, true, true, false, true)] // Immediate target expected, target is in virtual drive
+ [InlineData(true, true, true, true, false)] // Final target expected, target is in virtual drive
+ public void VirtualDrive_SymbolicLinks_WithIndirection(
+ bool isFirstLinkInVirtualDrive,
+ bool isMiddleLinkInVirtualDrive,
+ bool isTargetInVirtualDrive,
+ bool returnFinalTarget,
+ bool isExpectedTargetPathVirtual)
+ {
+ string firstLinkExpectedFolderPath = GetVirtualOrRealPath(isFirstLinkInVirtualDrive);
+ // File link
+ string fileLinkPath = Path.Join(firstLinkExpectedFolderPath, GetRandomLinkName());
+ // Directory link
+ string dirLinkPath = Path.Join(firstLinkExpectedFolderPath, GetRandomLinkName());
+
+ string middleLinkExpectedFolderPath = GetVirtualOrRealPath(isMiddleLinkInVirtualDrive);
+ // File middle link
+ string fileMiddleLinkFileName = GetRandomLinkName();
+ string fileMiddleLinkPath = Path.Join(middleLinkExpectedFolderPath, fileMiddleLinkFileName);
+ // Directory middle link
+ string dirMiddleLinkFileName = GetRandomLinkName();
+ string dirMiddleLinkPath = Path.Join(middleLinkExpectedFolderPath, dirMiddleLinkFileName);
+
+ string targetExpectedFolderPath = GetVirtualOrRealPath(isTargetInVirtualDrive);
+ // File final target
+ string fileFinalTargetFileName = GetRandomFileName();
+ string fileFinalTargetPath = Path.Join(targetExpectedFolderPath, fileFinalTargetFileName);
+ // Directory final target
+ string dirFinalTargetFileName = GetRandomDirName();
+ string dirFinalTargetPath = Path.Join(targetExpectedFolderPath, dirFinalTargetFileName);
+
+ // Create targets
+ File.Create(fileFinalTargetPath).Dispose();
+ Directory.CreateDirectory(dirFinalTargetPath);
+
+ // Create initial links
+ FileInfo fileLinkInfo = new FileInfo(fileLinkPath);
+ fileLinkInfo.CreateAsSymbolicLink(fileMiddleLinkPath);
+
+ DirectoryInfo dirLinkInfo = new DirectoryInfo(dirLinkPath);
+ dirLinkInfo.CreateAsSymbolicLink(dirMiddleLinkPath);
+
+ // Create middle links
+ FileInfo fileMiddleLinkInfo = new FileInfo(fileMiddleLinkPath);
+ fileMiddleLinkInfo.CreateAsSymbolicLink(fileFinalTargetPath);
+
+ DirectoryInfo dirMiddleLinkInfo = new DirectoryInfo(dirMiddleLinkPath);
+ dirMiddleLinkInfo.CreateAsSymbolicLink(dirFinalTargetPath);
+
+ // The expected results depend on the target location and the value of returnFinalTarget
+
+ // LinkTarget always retrieves the immediate target, so the expected value
+ // is always the path that was provided by the user for the middle link
+
+ // Verify the LinkTarget values of the link infos
+ Assert.Equal(fileMiddleLinkPath, fileLinkInfo.LinkTarget);
+ Assert.Equal(dirMiddleLinkPath, dirLinkInfo.LinkTarget);
+
+ // When the target is in a virtual drive,
+ // the expected target path is the real path, not the virtual path
+ // When returnFinalTarget is true, the expected target path is the
+ // resolved path from the final target in the chain of links
+ string expectedTargetPath = GetVirtualOrRealPath(isExpectedTargetPathVirtual);
+
+ string expectedTargetFileInfoFullName = Path.Join(expectedTargetPath,
+ returnFinalTarget ? fileFinalTargetFileName : fileMiddleLinkFileName);
+
+ string expectedTargetDirectoryInfoFullName = Path.Join(expectedTargetPath,
+ returnFinalTarget ? dirFinalTargetFileName : dirMiddleLinkFileName);
+
+ // Verify target infos from link info instances
+ FileSystemInfo? targetFileInfoFromFileInfoLink = fileLinkInfo.ResolveLinkTarget(returnFinalTarget);
+ FileSystemInfo? targetDirInfoFromDirInfoLink = dirLinkInfo.ResolveLinkTarget(returnFinalTarget);
+
+ Assert.True(targetFileInfoFromFileInfoLink is FileInfo);
+ Assert.True(targetDirInfoFromDirInfoLink is DirectoryInfo);
+
+ Assert.Equal(expectedTargetFileInfoFullName, targetFileInfoFromFileInfoLink.FullName);
+ Assert.Equal(expectedTargetDirectoryInfoFullName, targetDirInfoFromDirInfoLink.FullName);
+
+ // Verify targets infos via static methods
+ FileSystemInfo? targetFileInfoFromFile = File.ResolveLinkTarget(fileLinkPath, returnFinalTarget);
+ FileSystemInfo? targetFileInfoFromDirectory = Directory.ResolveLinkTarget(dirLinkPath, returnFinalTarget);
+
+ Assert.True(targetFileInfoFromFile is FileInfo);
+ Assert.True(targetFileInfoFromDirectory is DirectoryInfo);
+
+ Assert.Equal(expectedTargetFileInfoFullName, targetFileInfoFromFile.FullName);
+ Assert.Equal(expectedTargetDirectoryInfoFullName, targetFileInfoFromDirectory.FullName);
+ }
+
+ private string GetVirtualOrRealPath(bool condition) => condition ? $"{VirtualDriveLetter}:" : VirtualDriveTargetDir;
+
+ // Temporary Windows directory that can be mounted to a drive letter using the subst command
+ private string? _virtualDriveTargetDir = null;
+ private string VirtualDriveTargetDir
+ {
+ get
+ {
+ if (_virtualDriveTargetDir == null)
+ {
+ // Create a folder inside the temp directory so that it can be mounted to a drive letter with subst
+ _virtualDriveTargetDir = Path.Join(Path.GetTempPath(), GetRandomDirName());
+ Directory.CreateDirectory(_virtualDriveTargetDir);
+ }
+
+ return _virtualDriveTargetDir;
+ }
+ }
+
+ // Windows drive letter that points to a mounted directory using the subst command
+ private char _virtualDriveLetter = default;
+ private char VirtualDriveLetter
+ {
+ get
+ {
+ if (_virtualDriveLetter == default)
+ {
+ // Mount the folder to a drive letter
+ _virtualDriveLetter = MountHelper.CreateVirtualDrive(VirtualDriveTargetDir);
+ }
+ return _virtualDriveLetter;
+ }
+ }
+ }
+}
diff --git a/src/libraries/System.IO.Hashing/src/System.IO.Hashing.csproj b/src/libraries/System.IO.Hashing/src/System.IO.Hashing.csproj
index acfa86bb798d87..acdb05bb3e424b 100644
--- a/src/libraries/System.IO.Hashing/src/System.IO.Hashing.csproj
+++ b/src/libraries/System.IO.Hashing/src/System.IO.Hashing.csproj
@@ -4,8 +4,7 @@
enable
$(NetCoreAppCurrent);netstandard2.0;net461
true
-
- true
+ 1
Provides non-cryptographic hash algorithms, such as CRC-32.
Commonly Used Types:
diff --git a/src/libraries/System.IO.Hashing/src/System/IO/Hashing/XxHash32.cs b/src/libraries/System.IO.Hashing/src/System/IO/Hashing/XxHash32.cs
index d6db9bae19b2e3..792a5bbbffb8df 100644
--- a/src/libraries/System.IO.Hashing/src/System/IO/Hashing/XxHash32.cs
+++ b/src/libraries/System.IO.Hashing/src/System/IO/Hashing/XxHash32.cs
@@ -215,7 +215,7 @@ private static int StaticHash(ReadOnlySpan source, Span destination,
int totalLength = source.Length;
State state = new State((uint)seed);
- while (source.Length > StripeSize)
+ while (source.Length >= StripeSize)
{
state.ProcessStripe(source);
source = source.Slice(StripeSize);
diff --git a/src/libraries/System.IO.Hashing/src/System/IO/Hashing/XxHash64.cs b/src/libraries/System.IO.Hashing/src/System/IO/Hashing/XxHash64.cs
index 990ed77d64de27..367c6213c25fe3 100644
--- a/src/libraries/System.IO.Hashing/src/System/IO/Hashing/XxHash64.cs
+++ b/src/libraries/System.IO.Hashing/src/System/IO/Hashing/XxHash64.cs
@@ -215,7 +215,7 @@ private static int StaticHash(ReadOnlySpan source, Span destination,
int totalLength = source.Length;
State state = new State((ulong)seed);
- while (source.Length > StripeSize)
+ while (source.Length >= StripeSize)
{
state.ProcessStripe(source);
source = source.Slice(StripeSize);
diff --git a/src/libraries/System.IO.Hashing/tests/XxHash32Tests.007.cs b/src/libraries/System.IO.Hashing/tests/XxHash32Tests.007.cs
index eed5aec365b3eb..9ec9262dd1c5d8 100644
--- a/src/libraries/System.IO.Hashing/tests/XxHash32Tests.007.cs
+++ b/src/libraries/System.IO.Hashing/tests/XxHash32Tests.007.cs
@@ -36,6 +36,8 @@ public static IEnumerable TestCases
private const string DotNetHashesThis3 = DotNetHashesThis + DotNetHashesThis + DotNetHashesThis;
private const string DotNetNCHashing = ".NET now has non-crypto hashing";
private const string DotNetNCHashing3 = DotNetNCHashing + DotNetNCHashing + DotNetNCHashing;
+ private const string SixteenBytes = ".NET Hashes This";
+ private const string SixteenBytes3 = SixteenBytes + SixteenBytes + SixteenBytes;
protected static IEnumerable TestCaseDefinitions { get; } =
new[]
@@ -77,6 +79,11 @@ public static IEnumerable TestCases
$"{DotNetNCHashing} (x3)",
Encoding.ASCII.GetBytes(DotNetNCHashing3),
"CABC8ABD"),
+ // stripe size
+ new TestCase(
+ $"{SixteenBytes} (x3)",
+ Encoding.ASCII.GetBytes(SixteenBytes3),
+ "AD98EBD3")
};
protected override NonCryptographicHashAlgorithm CreateInstance() => new XxHash32(Seed);
diff --git a/src/libraries/System.IO.Hashing/tests/XxHash32Tests.cs b/src/libraries/System.IO.Hashing/tests/XxHash32Tests.cs
index f9dccad0294028..abd77d8c22f97d 100644
--- a/src/libraries/System.IO.Hashing/tests/XxHash32Tests.cs
+++ b/src/libraries/System.IO.Hashing/tests/XxHash32Tests.cs
@@ -34,6 +34,8 @@ public static IEnumerable TestCases
private const string DotNetHashesThis3 = DotNetHashesThis + DotNetHashesThis + DotNetHashesThis;
private const string DotNetNCHashing = ".NET now has non-crypto hashing";
private const string DotNetNCHashing3 = DotNetNCHashing + DotNetNCHashing + DotNetNCHashing;
+ private const string SixteenBytes = ".NET Hashes This";
+ private const string SixteenBytes3 = SixteenBytes + SixteenBytes + SixteenBytes;
protected static IEnumerable TestCaseDefinitions { get; } =
new[]
@@ -90,6 +92,11 @@ public static IEnumerable TestCases
$"{DotNetNCHashing} (x3)",
Encoding.ASCII.GetBytes(DotNetNCHashing3),
"65242024"),
+ // stripe size
+ new TestCase(
+ $"{SixteenBytes} (x3)",
+ Encoding.ASCII.GetBytes(SixteenBytes3),
+ "29DA7472")
};
protected override NonCryptographicHashAlgorithm CreateInstance() => new XxHash32();
diff --git a/src/libraries/System.IO.Hashing/tests/XxHash32Tests.f00d.cs b/src/libraries/System.IO.Hashing/tests/XxHash32Tests.f00d.cs
index 5171e62f8ca562..4a116bc50354e0 100644
--- a/src/libraries/System.IO.Hashing/tests/XxHash32Tests.f00d.cs
+++ b/src/libraries/System.IO.Hashing/tests/XxHash32Tests.f00d.cs
@@ -36,6 +36,8 @@ public static IEnumerable TestCases
private const string DotNetHashesThis3 = DotNetHashesThis + DotNetHashesThis + DotNetHashesThis;
private const string DotNetNCHashing = ".NET now has non-crypto hashing";
private const string DotNetNCHashing3 = DotNetNCHashing + DotNetNCHashing + DotNetNCHashing;
+ private const string SixteenBytes = ".NET Hashes This";
+ private const string SixteenBytes3 = SixteenBytes + SixteenBytes + SixteenBytes;
protected static IEnumerable TestCaseDefinitions { get; } =
new[]
@@ -77,6 +79,11 @@ public static IEnumerable TestCases
$"{DotNetNCHashing} (x3)",
Encoding.ASCII.GetBytes(DotNetNCHashing3),
"5A513E6D"),
+ // stripe size
+ new TestCase(
+ $"{SixteenBytes} (x3)",
+ Encoding.ASCII.GetBytes(SixteenBytes3),
+ "B38A9A45")
};
protected override NonCryptographicHashAlgorithm CreateInstance() => new XxHash32(Seed);
diff --git a/src/libraries/System.IO.Hashing/tests/XxHash64Tests.007.cs b/src/libraries/System.IO.Hashing/tests/XxHash64Tests.007.cs
index 5c2e575377870d..836b29230f3e67 100644
--- a/src/libraries/System.IO.Hashing/tests/XxHash64Tests.007.cs
+++ b/src/libraries/System.IO.Hashing/tests/XxHash64Tests.007.cs
@@ -38,6 +38,8 @@ public static IEnumerable TestCases
private const string DotNetNCHashing = ".NET now has non-crypto hashing";
private const string SixtyThreeBytes = "A sixty-three byte test input requires substantial forethought!";
private const string SixtyThreeBytes3 = SixtyThreeBytes + SixtyThreeBytes + SixtyThreeBytes;
+ private const string ThirtyTwoBytes = "This string has 32 ASCII bytes..";
+ private const string ThirtyTwoBytes3 = ThirtyTwoBytes + ThirtyTwoBytes + ThirtyTwoBytes;
protected static IEnumerable TestCaseDefinitions { get; } =
new[]
@@ -87,6 +89,11 @@ public static IEnumerable TestCases
$"{SixtyThreeBytes} (x3)",
Encoding.ASCII.GetBytes(SixtyThreeBytes3),
"D6095B93EB10BEDA"),
+ // stripe size
+ new TestCase(
+ $"{ThirtyTwoBytes} (x3)",
+ Encoding.ASCII.GetBytes(ThirtyTwoBytes3),
+ "45116421CF932B1F")
};
protected override NonCryptographicHashAlgorithm CreateInstance() => new XxHash64(Seed);
diff --git a/src/libraries/System.IO.Hashing/tests/XxHash64Tests.cs b/src/libraries/System.IO.Hashing/tests/XxHash64Tests.cs
index 973d108fc93778..213e6f91c252cf 100644
--- a/src/libraries/System.IO.Hashing/tests/XxHash64Tests.cs
+++ b/src/libraries/System.IO.Hashing/tests/XxHash64Tests.cs
@@ -36,6 +36,8 @@ public static IEnumerable TestCases
private const string DotNetNCHashing = ".NET now has non-crypto hashing";
private const string SixtyThreeBytes = "A sixty-three byte test input requires substantial forethought!";
private const string SixtyThreeBytes3 = SixtyThreeBytes + SixtyThreeBytes + SixtyThreeBytes;
+ private const string ThirtyTwoBytes = "This string has 32 ASCII bytes..";
+ private const string ThirtyTwoBytes3 = ThirtyTwoBytes + ThirtyTwoBytes + ThirtyTwoBytes;
protected static IEnumerable TestCaseDefinitions { get; } =
new[]
@@ -103,6 +105,11 @@ public static IEnumerable TestCases
$"{SixtyThreeBytes} (x3)",
Encoding.ASCII.GetBytes(SixtyThreeBytes3),
"239C7B3A85BD22B3"),
+ // stripe size
+ new TestCase(
+ $"{ThirtyTwoBytes} (x3)",
+ Encoding.ASCII.GetBytes(ThirtyTwoBytes3),
+ "975E3E6FE7E67FBC")
};
protected override NonCryptographicHashAlgorithm CreateInstance() => new XxHash64();
diff --git a/src/libraries/System.IO.Hashing/tests/XxHash64Tests.f00d.cs b/src/libraries/System.IO.Hashing/tests/XxHash64Tests.f00d.cs
index 23006a571627b3..75fc4f514aca9a 100644
--- a/src/libraries/System.IO.Hashing/tests/XxHash64Tests.f00d.cs
+++ b/src/libraries/System.IO.Hashing/tests/XxHash64Tests.f00d.cs
@@ -38,6 +38,8 @@ public static IEnumerable TestCases
private const string DotNetNCHashing = ".NET now has non-crypto hashing";
private const string SixtyThreeBytes = "A sixty-three byte test input requires substantial forethought!";
private const string SixtyThreeBytes3 = SixtyThreeBytes + SixtyThreeBytes + SixtyThreeBytes;
+ private const string ThirtyTwoBytes = "This string has 32 ASCII bytes..";
+ private const string ThirtyTwoBytes3 = ThirtyTwoBytes + ThirtyTwoBytes + ThirtyTwoBytes;
protected static IEnumerable TestCaseDefinitions { get; } =
new[]
@@ -87,6 +89,11 @@ public static IEnumerable TestCases
$"{SixtyThreeBytes} (x3)",
Encoding.ASCII.GetBytes(SixtyThreeBytes3),
"6F1C62EB48EA2FEC"),
+ // stripe size
+ new TestCase(
+ $"{ThirtyTwoBytes} (x3)",
+ Encoding.ASCII.GetBytes(ThirtyTwoBytes3),
+ "B358EB96B8E3E7AD")
};
protected override NonCryptographicHashAlgorithm CreateInstance() => new XxHash64(Seed);
diff --git a/src/libraries/System.IO.MemoryMappedFiles/src/System/IO/MemoryMappedFiles/MemoryMappedFile.Unix.cs b/src/libraries/System.IO.MemoryMappedFiles/src/System/IO/MemoryMappedFiles/MemoryMappedFile.Unix.cs
index 389ab072d9a6c9..6882527cecc8de 100644
--- a/src/libraries/System.IO.MemoryMappedFiles/src/System/IO/MemoryMappedFiles/MemoryMappedFile.Unix.cs
+++ b/src/libraries/System.IO.MemoryMappedFiles/src/System/IO/MemoryMappedFiles/MemoryMappedFile.Unix.cs
@@ -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.Diagnostics;
using Microsoft.Win32.SafeHandles;
namespace System.IO.MemoryMappedFiles
@@ -173,9 +174,6 @@ private static FileStream CreateSharedBackingObject(Interop.Sys.MemoryMappedProt
private static FileStream? CreateSharedBackingObjectUsingMemory(
Interop.Sys.MemoryMappedProtections protections, long capacity, HandleInheritability inheritability)
{
- // The POSIX shared memory object name must begin with '/'. After that we just want something short and unique.
- string mapName = string.Create(null, stackalloc char[128], $"/corefx_map_{Guid.NewGuid():N}");
-
// Determine the flags to use when creating the shared memory object
Interop.Sys.OpenFlags flags = (protections & Interop.Sys.MemoryMappedProtections.PROT_WRITE) != 0 ?
Interop.Sys.OpenFlags.O_RDWR :
@@ -191,22 +189,32 @@ private static FileStream CreateSharedBackingObject(Interop.Sys.MemoryMappedProt
if ((protections & Interop.Sys.MemoryMappedProtections.PROT_EXEC) != 0)
perms |= Interop.Sys.Permissions.S_IXUSR;
- // Create the shared memory object.
- SafeFileHandle fd = Interop.Sys.ShmOpen(mapName, flags, (int)perms);
- if (fd.IsInvalid)
+ string mapName;
+ SafeFileHandle fd;
+
+ do
{
- Interop.ErrorInfo errorInfo = Interop.Sys.GetLastErrorInfo();
- if (errorInfo.Error == Interop.Error.ENOTSUP)
+ mapName = GenerateMapName();
+ fd = Interop.Sys.ShmOpen(mapName, flags, (int)perms); // Create the shared memory object.
+
+ if (fd.IsInvalid)
{
- // If ShmOpen is not supported, fall back to file backing object.
- // Note that the System.Native shim will force this failure on platforms where
- // the result of native shm_open does not work well with our subsequent call
- // to mmap.
- return null;
- }
+ Interop.ErrorInfo errorInfo = Interop.Sys.GetLastErrorInfo();
+ fd.Dispose();
- throw Interop.GetExceptionForIoErrno(errorInfo);
- }
+ if (errorInfo.Error == Interop.Error.ENOTSUP)
+ {
+ // If ShmOpen is not supported, fall back to file backing object.
+ // Note that the System.Native shim will force this failure on platforms where
+ // the result of native shm_open does not work well with our subsequent call to mmap.
+ return null;
+ }
+ else if (errorInfo.Error != Interop.Error.EEXIST) // map with same name already existed
+ {
+ throw Interop.GetExceptionForIoErrno(errorInfo);
+ }
+ }
+ } while (fd.IsInvalid);
try
{
@@ -236,6 +244,18 @@ private static FileStream CreateSharedBackingObject(Interop.Sys.MemoryMappedProt
fd.Dispose();
throw;
}
+
+ static string GenerateMapName()
+ {
+ const int MaxSharedMemoryObjectNameLength = 32; // SHM_NAME_MAX on OSX ARM64, on other systems it's equal PATH_MAX (250)
+ // The POSIX shared memory object name must begin with '/'. After that we just want something short (32) and unique.
+ return string.Create(MaxSharedMemoryObjectNameLength, 0, (span, state) =>
+ {
+ Guid.NewGuid().TryFormat(span, out int charsWritten, "N");
+ Debug.Assert(charsWritten == MaxSharedMemoryObjectNameLength);
+ "/dotnet_".CopyTo(span);
+ });
+ }
}
private static FileStream CreateSharedBackingObjectUsingFile(Interop.Sys.MemoryMappedProtections protections, long capacity, HandleInheritability inheritability)
diff --git a/src/libraries/System.IO.MemoryMappedFiles/tests/MemoryMappedFile.CreateNew.Tests.cs b/src/libraries/System.IO.MemoryMappedFiles/tests/MemoryMappedFile.CreateNew.Tests.cs
index e7c5ee2f80c3a6..70b82398301d56 100644
--- a/src/libraries/System.IO.MemoryMappedFiles/tests/MemoryMappedFile.CreateNew.Tests.cs
+++ b/src/libraries/System.IO.MemoryMappedFiles/tests/MemoryMappedFile.CreateNew.Tests.cs
@@ -11,7 +11,6 @@ namespace System.IO.MemoryMappedFiles.Tests
///
/// Tests for MemoryMappedFile.CreateNew.
///
- [ActiveIssue("https://github.com/dotnet/runtime/issues/49104", typeof(PlatformDetection), nameof(PlatformDetection.IsMacOsAppleSilicon))]
public class MemoryMappedFileTests_CreateNew : MemoryMappedFilesTestBase
{
///
diff --git a/src/libraries/System.IO.MemoryMappedFiles/tests/MemoryMappedViewAccessor.Tests.cs b/src/libraries/System.IO.MemoryMappedFiles/tests/MemoryMappedViewAccessor.Tests.cs
index 8f7e2fae576eb0..8fe35396ae8044 100644
--- a/src/libraries/System.IO.MemoryMappedFiles/tests/MemoryMappedViewAccessor.Tests.cs
+++ b/src/libraries/System.IO.MemoryMappedFiles/tests/MemoryMappedViewAccessor.Tests.cs
@@ -11,7 +11,6 @@ namespace System.IO.MemoryMappedFiles.Tests
///
/// Tests for MemoryMappedViewAccessor.
///
- [ActiveIssue("https://github.com/dotnet/runtime/issues/49104", typeof(PlatformDetection), nameof(PlatformDetection.IsMacOsAppleSilicon))]
public class MemoryMappedViewAccessorTests : MemoryMappedFilesTestBase
{
///
@@ -91,10 +90,10 @@ public void ValidAccessLevelCombinations(MemoryMappedFileAccess mapAccess, Memor
}
catch (UnauthorizedAccessException)
{
- if ((OperatingSystem.IsMacOS() || OperatingSystem.IsMacCatalyst() || PlatformDetection.IsInContainer) &&
+ if ((OperatingSystem.IsMacOS() || OperatingSystem.IsMacCatalyst() || OperatingSystem.IsIOS() || OperatingSystem.IsTvOS() || PlatformDetection.IsInContainer) &&
(viewAccess == MemoryMappedFileAccess.ReadExecute || viewAccess == MemoryMappedFileAccess.ReadWriteExecute))
{
- // Containers and OSX with SIP enabled do not have execute permissions by default.
+ // Containers and OSXlike platforms with SIP enabled do not have execute permissions by default.
throw new SkipTestException("Insufficient execute permission.");
}
diff --git a/src/libraries/System.IO.MemoryMappedFiles/tests/MemoryMappedViewStream.Tests.cs b/src/libraries/System.IO.MemoryMappedFiles/tests/MemoryMappedViewStream.Tests.cs
index d77a24ae0ddfa6..f279b8c33f98f7 100644
--- a/src/libraries/System.IO.MemoryMappedFiles/tests/MemoryMappedViewStream.Tests.cs
+++ b/src/libraries/System.IO.MemoryMappedFiles/tests/MemoryMappedViewStream.Tests.cs
@@ -11,7 +11,6 @@ namespace System.IO.MemoryMappedFiles.Tests
///
/// Tests for MemoryMappedViewStream.
///
- [ActiveIssue("https://github.com/dotnet/runtime/issues/49104", typeof(PlatformDetection), nameof(PlatformDetection.IsMacOsAppleSilicon))]
public class MemoryMappedViewStreamTests : MemoryMappedFilesTestBase
{
///
@@ -91,10 +90,10 @@ public void ValidAccessLevelCombinations(MemoryMappedFileAccess mapAccess, Memor
}
catch (UnauthorizedAccessException)
{
- if ((OperatingSystem.IsMacOS() || OperatingSystem.IsMacCatalyst() || PlatformDetection.IsInContainer) &&
+ if ((OperatingSystem.IsMacOS() || OperatingSystem.IsMacCatalyst() || OperatingSystem.IsIOS() || OperatingSystem.IsTvOS() || PlatformDetection.IsInContainer) &&
(viewAccess == MemoryMappedFileAccess.ReadExecute || viewAccess == MemoryMappedFileAccess.ReadWriteExecute))
{
- // Containers and OSX with SIP enabled do not have execute permissions by default.
+ // Containers and OSXlike platforms with SIP enabled do not have execute permissions by default.
throw new SkipTestException("Insufficient execute permission.");
}
diff --git a/src/libraries/System.IO.MemoryMappedFiles/tests/MemoryMappedViewStreamConformanceTests.cs b/src/libraries/System.IO.MemoryMappedFiles/tests/MemoryMappedViewStreamConformanceTests.cs
index e84a86a91f20cc..c190d329a00fe6 100644
--- a/src/libraries/System.IO.MemoryMappedFiles/tests/MemoryMappedViewStreamConformanceTests.cs
+++ b/src/libraries/System.IO.MemoryMappedFiles/tests/MemoryMappedViewStreamConformanceTests.cs
@@ -45,7 +45,6 @@ private Task CreateStream(byte[] initialData, FileAccess access)
}
}
- [ActiveIssue("https://github.com/dotnet/runtime/issues/49104", typeof(PlatformDetection), nameof(PlatformDetection.IsMacOsAppleSilicon))]
public class AnonymousMemoryMappedViewStreamConformanceTests : MemoryMappedViewStreamConformanceTests
{
protected override MemoryMappedFile CreateFile(int length) =>
diff --git a/src/libraries/System.IO.Packaging/src/CompatibilitySuppressions.xml b/src/libraries/System.IO.Packaging/src/CompatibilitySuppressions.xml
index ca7554cc926e6c..c4a6f07ed08c6a 100644
--- a/src/libraries/System.IO.Packaging/src/CompatibilitySuppressions.xml
+++ b/src/libraries/System.IO.Packaging/src/CompatibilitySuppressions.xml
@@ -1,10 +1,5 @@
-
- CP0001
- lib/netstandard2.0/System.IO.Packaging.dll
- lib/net461/System.IO.Packaging.dll
-
PKV006
.NETFramework,Version=v4.6
diff --git a/src/libraries/System.IO.Pipelines/src/System.IO.Pipelines.csproj b/src/libraries/System.IO.Pipelines/src/System.IO.Pipelines.csproj
index 34f79827374acc..ec9632c4d1f25f 100644
--- a/src/libraries/System.IO.Pipelines/src/System.IO.Pipelines.csproj
+++ b/src/libraries/System.IO.Pipelines/src/System.IO.Pipelines.csproj
@@ -9,6 +9,7 @@ Commonly Used Types:
System.IO.Pipelines.Pipe
System.IO.Pipelines.PipeWriter
System.IO.Pipelines.PipeReader
+ 2
source)
}
// We filled the segment
- _writingHead.End += writable;
+ _writingHead.End += _writingHeadBytesBuffered;
_writingHeadBytesBuffered = 0;
// This is optimized to use pooled memory. That's why we pass 0 instead of
diff --git a/src/libraries/System.IO.Pipelines/src/System/IO/Pipelines/PipeAwaitable.cs b/src/libraries/System.IO.Pipelines/src/System/IO/Pipelines/PipeAwaitable.cs
index fb25780a3fab46..aba52f13e96469 100644
--- a/src/libraries/System.IO.Pipelines/src/System/IO/Pipelines/PipeAwaitable.cs
+++ b/src/libraries/System.IO.Pipelines/src/System/IO/Pipelines/PipeAwaitable.cs
@@ -47,16 +47,33 @@ public void BeginOperation(CancellationToken cancellationToken, Action
{
cancellationToken.ThrowIfCancellationRequested();
- _awaitableState |= AwaitableState.Running;
-
// Don't register if already completed, we would immediately unregistered in ObserveCancellation
if (cancellationToken.CanBeCanceled && !IsCompleted)
{
+#if DEBUG
+ var previousAwaitableState = _awaitableState;
+#endif
+
+ _cancellationTokenRegistration = cancellationToken.UnsafeRegister(callback, state);
+
+ // If we get back the default CancellationTokenRegistration then it means the
+ // callback synchronously and we can throw inline. This is safe because we haven't changed
+ // the state of the awaitable as yet.
+ if (_cancellationTokenRegistration == default(CancellationTokenRegistration))
+ {
+#if DEBUG
+ Debug.Assert(previousAwaitableState == _awaitableState, "The awaitable state changed!");
+#endif
+
+ cancellationToken.ThrowIfCancellationRequested();
+ }
+
#if (NETSTANDARD2_0 || NETFRAMEWORK)
_cancellationToken = cancellationToken;
#endif
- _cancellationTokenRegistration = cancellationToken.UnsafeRegister(callback, state);
}
+
+ _awaitableState |= AwaitableState.Running;
}
[MethodImpl(MethodImplOptions.AggressiveInlining)]
diff --git a/src/libraries/System.IO.Pipelines/src/System/IO/Pipelines/StreamPipeReader.cs b/src/libraries/System.IO.Pipelines/src/System/IO/Pipelines/StreamPipeReader.cs
index 7b33539b540b33..cc457bf9bf2bff 100644
--- a/src/libraries/System.IO.Pipelines/src/System/IO/Pipelines/StreamPipeReader.cs
+++ b/src/libraries/System.IO.Pipelines/src/System/IO/Pipelines/StreamPipeReader.cs
@@ -383,11 +383,13 @@ public override async Task CopyToAsync(PipeWriter destination, CancellationToken
try
{
BufferSegment? segment = _readHead;
+ int segmentIndex = _readIndex;
+
try
{
while (segment != null)
{
- FlushResult flushResult = await destination.WriteAsync(segment.Memory, tokenSource.Token).ConfigureAwait(false);
+ FlushResult flushResult = await destination.WriteAsync(segment.Memory.Slice(segmentIndex), tokenSource.Token).ConfigureAwait(false);
if (flushResult.IsCanceled)
{
@@ -395,6 +397,7 @@ public override async Task CopyToAsync(PipeWriter destination, CancellationToken
}
segment = segment.NextSegment;
+ segmentIndex = 0;
if (flushResult.IsCompleted)
{
@@ -451,13 +454,16 @@ public override async Task CopyToAsync(Stream destination, CancellationToken can
try
{
BufferSegment? segment = _readHead;
+ int segmentIndex = _readIndex;
+
try
{
while (segment != null)
{
- await destination.WriteAsync(segment.Memory, tokenSource.Token).ConfigureAwait(false);
+ await destination.WriteAsync(segment.Memory.Slice(segmentIndex), tokenSource.Token).ConfigureAwait(false);
segment = segment.NextSegment;
+ segmentIndex = 0;
}
}
finally
diff --git a/src/libraries/System.IO.Pipelines/tests/PipeLengthTests.cs b/src/libraries/System.IO.Pipelines/tests/PipeLengthTests.cs
index fcf9d7af55b053..fd9fc83833a8b1 100644
--- a/src/libraries/System.IO.Pipelines/tests/PipeLengthTests.cs
+++ b/src/libraries/System.IO.Pipelines/tests/PipeLengthTests.cs
@@ -277,5 +277,19 @@ public async Task NullExaminedAndConsumedNoops()
ReadResult result = await _pipe.Reader.ReadAsync();
_pipe.Reader.AdvanceTo(default, default);
}
+
+ [Fact]
+ public async Task AdvanceFollowedByWriteAsyncTest()
+ {
+ Memory buffer = new byte[26];
+ Pipe pipe = new(new PipeOptions(minimumSegmentSize: 1));
+
+ var mem = pipe.Writer.GetMemory(14)[..14];
+ buffer[..14].CopyTo(mem);
+ pipe.Writer.Advance(14);
+ await pipe.Writer.WriteAsync(buffer[14..]);
+ ReadResult res = await pipe.Reader.ReadAsync();
+ Assert.Equal(res.Buffer.Length, buffer.Length);
+ }
}
}
diff --git a/src/libraries/System.IO.Pipelines/tests/PipeReaderCopyToAsyncTests.cs b/src/libraries/System.IO.Pipelines/tests/PipeReaderCopyToAsyncTests.cs
index e58e5af4e70598..adf547a3c452bf 100644
--- a/src/libraries/System.IO.Pipelines/tests/PipeReaderCopyToAsyncTests.cs
+++ b/src/libraries/System.IO.Pipelines/tests/PipeReaderCopyToAsyncTests.cs
@@ -286,5 +286,41 @@ public async Task ThrowingFromStreamCallsAdvanceToWithStartOfLastReadResult(int
Assert.True(startPosition.Equals(wrappedPipeReader.LastConsumed));
Assert.True(startPosition.Equals(wrappedPipeReader.LastExamined));
}
+
+ [Fact]
+ public async Task CopyToAsyncStreamCopiesRemainderAfterReadingSome()
+ {
+ var buffer = Encoding.UTF8.GetBytes("Hello World");
+ await Pipe.Writer.WriteAsync(buffer);
+ Pipe.Writer.Complete();
+
+ var result = await PipeReader.ReadAsync();
+ Assert.Equal(result.Buffer.ToArray(), buffer);
+ // Consume Hello
+ PipeReader.AdvanceTo(result.Buffer.GetPosition(5));
+
+ var ms = new MemoryStream();
+ await PipeReader.CopyToAsync(ms);
+
+ Assert.Equal(buffer.AsMemory(5).ToArray(), ms.ToArray());
+ }
+
+ [Fact]
+ public async Task CopyToAsyncPipeWriterCopiesRemainderAfterReadingSome()
+ {
+ var buffer = Encoding.UTF8.GetBytes("Hello World");
+ await Pipe.Writer.WriteAsync(buffer);
+ Pipe.Writer.Complete();
+
+ var result = await PipeReader.ReadAsync();
+ Assert.Equal(result.Buffer.ToArray(), buffer);
+ // Consume Hello
+ PipeReader.AdvanceTo(result.Buffer.GetPosition(5));
+
+ var ms = new MemoryStream();
+ await PipeReader.CopyToAsync(PipeWriter.Create(ms));
+
+ Assert.Equal(buffer.AsMemory(5).ToArray(), ms.ToArray());
+ }
}
}
diff --git a/src/libraries/System.IO.Ports/pkg/runtime.native.System.IO.Ports.proj b/src/libraries/System.IO.Ports/pkg/runtime.native.System.IO.Ports.proj
index 86043b1f0aa51a..ff96f2f4fca135 100644
--- a/src/libraries/System.IO.Ports/pkg/runtime.native.System.IO.Ports.proj
+++ b/src/libraries/System.IO.Ports/pkg/runtime.native.System.IO.Ports.proj
@@ -6,6 +6,8 @@
false
$(NoWarn);NU5128
+
+ false
diff --git a/src/libraries/System.IO.Ports/pkg/runtime.native.System.IO.Ports.props b/src/libraries/System.IO.Ports/pkg/runtime.native.System.IO.Ports.props
index 557c2231228086..4824f36ff0a4bf 100644
--- a/src/libraries/System.IO.Ports/pkg/runtime.native.System.IO.Ports.props
+++ b/src/libraries/System.IO.Ports/pkg/runtime.native.System.IO.Ports.props
@@ -8,10 +8,13 @@
none
true
$(SymbolsSuffix)
- $(TargetsForTfmSpecificDebugSymbolsInPackage);AddRuntimeSpecificNativeSymbolToPackage
+
+ $(TargetsForTfmSpecificDebugSymbolsInPackage);AddRuntimeSpecificNativeSymbolToPackage
true
$(NoWarn);NU5128
+
+ false
diff --git a/src/libraries/System.IO.Ports/pkg/runtime.osx-arm64.runtime.native.System.IO.Ports.proj b/src/libraries/System.IO.Ports/pkg/runtime.osx-arm64.runtime.native.System.IO.Ports.proj
new file mode 100644
index 00000000000000..f93b313169e79c
--- /dev/null
+++ b/src/libraries/System.IO.Ports/pkg/runtime.osx-arm64.runtime.native.System.IO.Ports.proj
@@ -0,0 +1,7 @@
+
+
+
+
+ true
+
+
\ No newline at end of file
diff --git a/src/libraries/System.IO.Ports/src/CompatibilitySuppressions.xml b/src/libraries/System.IO.Ports/src/CompatibilitySuppressions.xml
deleted file mode 100644
index 3d3afe95121eaa..00000000000000
--- a/src/libraries/System.IO.Ports/src/CompatibilitySuppressions.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-
-
-
- CP0001
- lib/netstandard2.0/System.IO.Ports.dll
- lib/net461/System.IO.Ports.dll
-
-
- CP0001
- T:System.IO.Ports.Handshake
- lib/net461/System.IO.Ports.dll
- runtimes/unix/lib/netstandard2.0/System.IO.Ports.dll
-
-
- CP0001
- T:System.IO.Ports.Parity
- lib/net461/System.IO.Ports.dll
- runtimes/unix/lib/netstandard2.0/System.IO.Ports.dll
-
-
- CP0001
- T:System.IO.Ports.SerialData
- lib/net461/System.IO.Ports.dll
- runtimes/unix/lib/netstandard2.0/System.IO.Ports.dll
-
-
- CP0001
- T:System.IO.Ports.SerialDataReceivedEventArgs
- lib/net461/System.IO.Ports.dll
- runtimes/unix/lib/netstandard2.0/System.IO.Ports.dll
-
-
- CP0001
- T:System.IO.Ports.SerialDataReceivedEventHandler
- lib/net461/System.IO.Ports.dll
- runtimes/unix/lib/netstandard2.0/System.IO.Ports.dll
-
-
- CP0001
- T:System.IO.Ports.SerialError
- lib/net461/System.IO.Ports.dll
- runtimes/unix/lib/netstandard2.0/System.IO.Ports.dll
-
-
- CP0001
- T:System.IO.Ports.SerialErrorReceivedEventArgs
- lib/net461/System.IO.Ports.dll
- runtimes/unix/lib/netstandard2.0/System.IO.Ports.dll
-
-
- CP0001
- T:System.IO.Ports.SerialErrorReceivedEventHandler
- lib/net461/System.IO.Ports.dll
- runtimes/unix/lib/netstandard2.0/System.IO.Ports.dll
-
-
- CP0001
- T:System.IO.Ports.SerialPinChange
- lib/net461/System.IO.Ports.dll
- runtimes/unix/lib/netstandard2.0/System.IO.Ports.dll
-
-
- CP0001
- T:System.IO.Ports.SerialPinChangedEventArgs
- lib/net461/System.IO.Ports.dll
- runtimes/unix/lib/netstandard2.0/System.IO.Ports.dll
-
-
- CP0001
- T:System.IO.Ports.SerialPinChangedEventHandler
- lib/net461/System.IO.Ports.dll
- runtimes/unix/lib/netstandard2.0/System.IO.Ports.dll
-
-
- CP0001
- T:System.IO.Ports.SerialPort
- lib/net461/System.IO.Ports.dll
- runtimes/unix/lib/netstandard2.0/System.IO.Ports.dll
-
-
- CP0001
- T:System.IO.Ports.StopBits
- lib/net461/System.IO.Ports.dll
- runtimes/unix/lib/netstandard2.0/System.IO.Ports.dll
-
-
\ No newline at end of file
diff --git a/src/libraries/System.IO.Ports/tests/SerialPort/DosDevices.cs b/src/libraries/System.IO.Ports/tests/SerialPort/DosDevices.cs
index 3fe9493c0a30e5..2d74327f97eb0d 100644
--- a/src/libraries/System.IO.Ports/tests/SerialPort/DosDevices.cs
+++ b/src/libraries/System.IO.Ports/tests/SerialPort/DosDevices.cs
@@ -3,6 +3,7 @@
using System.Collections;
using System.Collections.Generic;
+using System.ComponentModel;
using System.Runtime.InteropServices;
namespace System.IO.Ports.Tests
@@ -127,14 +128,20 @@ private static char[] CallQueryDosDevice(string name, out int dataSize)
buffer = new char[buffer.Length * 2];
dataSize = QueryDosDevice(null, buffer, buffer.Length);
}
+ else if (lastError == ERROR_ACCESS_DENIED) // Access denied eg for "MSSECFLTSYS" - just skip
+ {
+ dataSize = 0;
+ break;
+ }
else
{
- throw new Exception("Unknown Win32 Error: " + lastError);
+ throw new Exception($"Error {lastError} calling QueryDosDevice for '{name}' with buffer size {buffer.Length}. {new Win32Exception((int)lastError).Message}");
}
}
return buffer;
}
+ public const int ERROR_ACCESS_DENIED = 5;
public const int ERROR_INSUFFICIENT_BUFFER = 122;
public const int ERROR_MORE_DATA = 234;
diff --git a/src/libraries/System.IO/tests/BufferedStream/BufferedStreamTests.cs b/src/libraries/System.IO/tests/BufferedStream/BufferedStreamTests.cs
index 08268755202054..8d11c80336711a 100644
--- a/src/libraries/System.IO/tests/BufferedStream/BufferedStreamTests.cs
+++ b/src/libraries/System.IO/tests/BufferedStream/BufferedStreamTests.cs
@@ -323,6 +323,40 @@ public async Task CopyToTest_ReadBeforeCopy_CopiesAllData(bool copyAsynchronousl
Array.Copy(data, 1, expected, 0, expected.Length);
Assert.Equal(expected, dst.ToArray());
}
+
+ [Fact]
+ [OuterLoop]
+ [ActiveIssue("https://github.com/dotnet/runtime/issues/45954", TestPlatforms.Browser)]
+ public void NoInt32OverflowInTheBufferingLogic()
+ {
+ const long position1 = 10;
+ const long position2 = (1L << 32) + position1;
+
+ string filePath = Path.GetTempFileName();
+ byte[] data1 = new byte[] { 1, 2, 3, 4, 5 };
+ byte[] data2 = new byte[] { 6, 7, 8, 9, 10 };
+ byte[] buffer = new byte[5];
+
+ using (var stream = new FileStream(filePath, FileMode.Create, FileAccess.Write))
+ {
+ stream.Seek(position1, SeekOrigin.Begin);
+ stream.Write(data1);
+
+ stream.Seek(position2, SeekOrigin.Begin);
+ stream.Write(data2);
+ }
+
+ using (var stream = new BufferedStream(new FileStream(filePath, FileMode.Open, FileAccess.Read, FileShare.None, bufferSize: 0, FileOptions.DeleteOnClose)))
+ {
+ stream.Seek(position1, SeekOrigin.Begin);
+ Assert.Equal(buffer.Length, stream.Read(buffer));
+ Assert.Equal(data1, buffer);
+
+ stream.Seek(position2, SeekOrigin.Begin);
+ Assert.Equal(buffer.Length, stream.Read(buffer));
+ Assert.Equal(data2, buffer);
+ }
+ }
}
public class BufferedStream_TestLeaveOpen : TestLeaveOpen
diff --git a/src/libraries/System.IO/tests/Net5CompatTests/System.IO.Net5Compat.Tests.csproj b/src/libraries/System.IO/tests/Net5CompatTests/System.IO.Net5Compat.Tests.csproj
index 321e2f485088b8..c07749abe26b08 100644
--- a/src/libraries/System.IO/tests/Net5CompatTests/System.IO.Net5Compat.Tests.csproj
+++ b/src/libraries/System.IO/tests/Net5CompatTests/System.IO.Net5Compat.Tests.csproj
@@ -4,8 +4,7 @@
true
true
true
-
- $(NetCoreAppCurrent)-windows
+ $(NetCoreAppCurrent)
diff --git a/src/libraries/System.Memory.Data/System.Memory.Data.sln b/src/libraries/System.Memory.Data/System.Memory.Data.sln
index 5878d08ab4271f..3c371f8d59a503 100644
--- a/src/libraries/System.Memory.Data/System.Memory.Data.sln
+++ b/src/libraries/System.Memory.Data/System.Memory.Data.sln
@@ -17,8 +17,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServ
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Encodings.Web", "..\System.Text.Encodings.Web\src\System.Text.Encodings.Web.csproj", "{0DE5E7DA-0AE0-4CF2-95AB-1E476FD68C5C}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Json.SourceGeneration", "..\System.Text.Json\gen\System.Text.Json.SourceGeneration.csproj", "{9F2EC2C8-6E28-404A-8087-7A0518624EC6}"
-EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Json", "..\System.Text.Json\src\System.Text.Json.csproj", "{6A2B5C68-14C3-4989-8530-D51A138C72AE}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{2BD73108-47D7-40E6-BFCB-169E6AD42A81}"
@@ -65,10 +63,6 @@ Global
{B9162F6C-4CD1-4D33-BA4A-42830A1B1C66}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B9162F6C-4CD1-4D33-BA4A-42830A1B1C66}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B9162F6C-4CD1-4D33-BA4A-42830A1B1C66}.Release|Any CPU.Build.0 = Release|Any CPU
- {9F2EC2C8-6E28-404A-8087-7A0518624EC6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {9F2EC2C8-6E28-404A-8087-7A0518624EC6}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {9F2EC2C8-6E28-404A-8087-7A0518624EC6}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {9F2EC2C8-6E28-404A-8087-7A0518624EC6}.Release|Any CPU.Build.0 = Release|Any CPU
{0DE5E7DA-0AE0-4CF2-95AB-1E476FD68C5C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{0DE5E7DA-0AE0-4CF2-95AB-1E476FD68C5C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{0DE5E7DA-0AE0-4CF2-95AB-1E476FD68C5C}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -90,7 +84,6 @@ Global
{ACDB56AF-7B9F-4762-9764-D6FF09118D09} = {D908DCBE-EFA4-4CCA-9A1C-AEB48D59C504}
{6A2B5C68-14C3-4989-8530-D51A138C72AE} = {D908DCBE-EFA4-4CCA-9A1C-AEB48D59C504}
{E17B915A-81CA-44D8-818E-512B65609475} = {D908DCBE-EFA4-4CCA-9A1C-AEB48D59C504}
- {9F2EC2C8-6E28-404A-8087-7A0518624EC6} = {D908DCBE-EFA4-4CCA-9A1C-AEB48D59C504}
{0DE5E7DA-0AE0-4CF2-95AB-1E476FD68C5C} = {D908DCBE-EFA4-4CCA-9A1C-AEB48D59C504}
{1D866ECD-FD46-4FCA-9408-D1E3E9CB1F43} = {D908DCBE-EFA4-4CCA-9A1C-AEB48D59C504}
EndGlobalSection
diff --git a/src/libraries/System.Memory/tests/ArrayBufferWriter/ArrayBufferWriterTests.T.cs b/src/libraries/System.Memory/tests/ArrayBufferWriter/ArrayBufferWriterTests.T.cs
index 656918e5fe6e7d..b1a6c293aef32c 100644
--- a/src/libraries/System.Memory/tests/ArrayBufferWriter/ArrayBufferWriterTests.T.cs
+++ b/src/libraries/System.Memory/tests/ArrayBufferWriter/ArrayBufferWriterTests.T.cs
@@ -65,7 +65,6 @@ public void Clear()
}
[Fact]
- [SkipOnCoreClr("https://github.com/dotnet/runtime/issues/42517", RuntimeConfiguration.Checked)]
public void Advance()
{
{
diff --git a/src/libraries/System.Net.Http.Json/System.Net.Http.Json.sln b/src/libraries/System.Net.Http.Json/System.Net.Http.Json.sln
index e7575d6b03568b..73280ee3f28c5c 100644
--- a/src/libraries/System.Net.Http.Json/System.Net.Http.Json.sln
+++ b/src/libraries/System.Net.Http.Json/System.Net.Http.Json.sln
@@ -21,8 +21,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServ
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Encodings.Web", "..\System.Text.Encodings.Web\src\System.Text.Encodings.Web.csproj", "{FEBE9C47-A00B-40B2-A85B-74ECE2F8B80A}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Json.SourceGeneration", "..\System.Text.Json\gen\System.Text.Json.SourceGeneration.csproj", "{D120D5A7-69D9-44A2-B7F7-EE0E48CC0238}"
-EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Json", "..\System.Text.Json\src\System.Text.Json.csproj", "{BC7D3412-DBCB-4863-8BF8-41899E32608C}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{945B0700-C720-4775-B9E4-6A27DAA90190}"
@@ -57,10 +55,6 @@ Global
{3AD3D600-C391-492D-B3D6-0F6C03DA5C27}.Debug|Any CPU.Build.0 = Debug|Any CPU
{3AD3D600-C391-492D-B3D6-0F6C03DA5C27}.Release|Any CPU.ActiveCfg = Release|Any CPU
{3AD3D600-C391-492D-B3D6-0F6C03DA5C27}.Release|Any CPU.Build.0 = Release|Any CPU
- {D120D5A7-69D9-44A2-B7F7-EE0E48CC0238}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {D120D5A7-69D9-44A2-B7F7-EE0E48CC0238}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {D120D5A7-69D9-44A2-B7F7-EE0E48CC0238}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {D120D5A7-69D9-44A2-B7F7-EE0E48CC0238}.Release|Any CPU.Build.0 = Release|Any CPU
{BC7D3412-DBCB-4863-8BF8-41899E32608C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{BC7D3412-DBCB-4863-8BF8-41899E32608C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{BC7D3412-DBCB-4863-8BF8-41899E32608C}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -102,7 +96,6 @@ Global
{1D6F4698-E7FA-4AE3-A7A4-98939E40D08D} = {A75027EA-199E-4C86-A636-AE9AE0F0756C}
{3AD3D600-C391-492D-B3D6-0F6C03DA5C27} = {A75027EA-199E-4C86-A636-AE9AE0F0756C}
{7DC969DA-8BD3-4E64-88E8-26AFE65BFF7E} = {2A66925D-3658-46BE-A730-5BF70D8D5B90}
- {D120D5A7-69D9-44A2-B7F7-EE0E48CC0238} = {2A66925D-3658-46BE-A730-5BF70D8D5B90}
{BC7D3412-DBCB-4863-8BF8-41899E32608C} = {2A66925D-3658-46BE-A730-5BF70D8D5B90}
{3EEB6FCC-2592-4879-ADDD-0FDC7AEB7BC1} = {2A66925D-3658-46BE-A730-5BF70D8D5B90}
{4FB629CD-5FFC-47AC-9670-A2A8AFEE8926} = {2A66925D-3658-46BE-A730-5BF70D8D5B90}
diff --git a/src/libraries/System.Net.Http.Json/tests/FunctionalTests/System.Net.Http.Json.Functional.Tests.csproj b/src/libraries/System.Net.Http.Json/tests/FunctionalTests/System.Net.Http.Json.Functional.Tests.csproj
index 9fe7bbb28a73ba..40ae1eb7e9b284 100644
--- a/src/libraries/System.Net.Http.Json/tests/FunctionalTests/System.Net.Http.Json.Functional.Tests.csproj
+++ b/src/libraries/System.Net.Http.Json/tests/FunctionalTests/System.Net.Http.Json.Functional.Tests.csproj
@@ -27,6 +27,6 @@
-
+
diff --git a/src/libraries/System.Net.Http.WinHttpHandler/System.Net.Http.WinHttpHandler.sln b/src/libraries/System.Net.Http.WinHttpHandler/System.Net.Http.WinHttpHandler.sln
index d6d95c23aa12a0..7c181ccbde038f 100644
--- a/src/libraries/System.Net.Http.WinHttpHandler/System.Net.Http.WinHttpHandler.sln
+++ b/src/libraries/System.Net.Http.WinHttpHandler/System.Net.Http.WinHttpHandler.sln
@@ -27,8 +27,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServ
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Encodings.Web", "..\System.Text.Encodings.Web\src\System.Text.Encodings.Web.csproj", "{BACC5257-6CA8-45C7-970F-C8D501DA59AB}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Json.SourceGeneration", "..\System.Text.Json\gen\System.Text.Json.SourceGeneration.csproj", "{302F00AD-85F1-4DE9-B100-41F8EAB93B7C}"
-EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Json", "..\System.Text.Json\src\System.Text.Json.csproj", "{E470810A-BAF2-4B3C-92CB-72007B7F1B6A}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2F9A243D-B060-4BB2-A9E1-A9CB861328D9}"
@@ -95,10 +93,6 @@ Global
{BACC5257-6CA8-45C7-970F-C8D501DA59AB}.Debug|Any CPU.Build.0 = Debug|Any CPU
{BACC5257-6CA8-45C7-970F-C8D501DA59AB}.Release|Any CPU.ActiveCfg = Release|Any CPU
{BACC5257-6CA8-45C7-970F-C8D501DA59AB}.Release|Any CPU.Build.0 = Release|Any CPU
- {302F00AD-85F1-4DE9-B100-41F8EAB93B7C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {302F00AD-85F1-4DE9-B100-41F8EAB93B7C}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {302F00AD-85F1-4DE9-B100-41F8EAB93B7C}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {302F00AD-85F1-4DE9-B100-41F8EAB93B7C}.Release|Any CPU.Build.0 = Release|Any CPU
{4BA25EC1-B76B-4410-AF2D-A54B90FAB404}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{4BA25EC1-B76B-4410-AF2D-A54B90FAB404}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4BA25EC1-B76B-4410-AF2D-A54B90FAB404}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -123,7 +117,6 @@ Global
{E6A8B90B-69CD-4B0D-8A33-F208A3169674} = {49E09973-383D-4AD6-9D88-B93A02031607}
{E470810A-BAF2-4B3C-92CB-72007B7F1B6A} = {49E09973-383D-4AD6-9D88-B93A02031607}
{BACC5257-6CA8-45C7-970F-C8D501DA59AB} = {49E09973-383D-4AD6-9D88-B93A02031607}
- {302F00AD-85F1-4DE9-B100-41F8EAB93B7C} = {49E09973-383D-4AD6-9D88-B93A02031607}
{4BA25EC1-B76B-4410-AF2D-A54B90FAB404} = {49E09973-383D-4AD6-9D88-B93A02031607}
{090BA6CA-F661-4BDE-9663-65F8231DDB1D} = {6C66589E-2DB3-4635-BADA-9B6452327239}
{E9D5AB56-2597-42E0-BE81-C00CC63D1FB3} = {6C66589E-2DB3-4635-BADA-9B6452327239}
diff --git a/src/libraries/System.Net.Http.WinHttpHandler/src/System/Net/Http/WinHttpHandler.cs b/src/libraries/System.Net.Http.WinHttpHandler/src/System/Net/Http/WinHttpHandler.cs
index 8173084e53c5e3..07133b2667c229 100644
--- a/src/libraries/System.Net.Http.WinHttpHandler/src/System/Net/Http/WinHttpHandler.cs
+++ b/src/libraries/System.Net.Http.WinHttpHandler/src/System/Net/Http/WinHttpHandler.cs
@@ -44,6 +44,7 @@ public class WinHttpHandler : HttpMessageHandler
private static readonly StringWithQualityHeaderValue s_gzipHeaderValue = new StringWithQualityHeaderValue("gzip");
private static readonly StringWithQualityHeaderValue s_deflateHeaderValue = new StringWithQualityHeaderValue("deflate");
+ private static readonly Lazy s_supportsTls13 = new Lazy(() => CheckTls13Support());
[ThreadStatic]
private static StringBuilder? t_requestHeadersBuilder;
@@ -1119,6 +1120,7 @@ private void SetSessionHandleOptions(SafeWinHttpHandle sessionHandle)
SetSessionHandleTimeoutOptions(sessionHandle);
SetDisableHttp2StreamQueue(sessionHandle);
SetTcpKeepalive(sessionHandle);
+ SetRequireStreamEnd(sessionHandle);
}
private unsafe void SetTcpKeepalive(SafeWinHttpHandle sessionHandle)
@@ -1144,6 +1146,27 @@ private unsafe void SetTcpKeepalive(SafeWinHttpHandle sessionHandle)
}
}
+ private void SetRequireStreamEnd(SafeWinHttpHandle sessionHandle)
+ {
+ if (WinHttpTrailersHelper.OsSupportsTrailers)
+ {
+ // Setting WINHTTP_OPTION_REQUIRE_STREAM_END to TRUE is needed for WinHttp to read trailing headers
+ // in case the response has Content-Lenght defined.
+ // According to the WinHttp team, the feature-detection logic in WinHttpTrailersHelper.OsSupportsTrailers
+ // should also indicate the support of WINHTTP_OPTION_REQUIRE_STREAM_END.
+ // WINHTTP_OPTION_REQUIRE_STREAM_END doesn't have effect on HTTP 1.1 requests, therefore it's safe to set it on
+ // the session handle so it is inhereted by all request handles.
+ uint optionData = 1;
+ if (!Interop.WinHttp.WinHttpSetOption(sessionHandle, Interop.WinHttp.WINHTTP_OPTION_REQUIRE_STREAM_END, ref optionData))
+ {
+ if (NetEventSource.Log.IsEnabled())
+ {
+ NetEventSource.Info(this, "Failed to enable WINHTTP_OPTION_REQUIRE_STREAM_END error code: " + Marshal.GetLastWin32Error());
+ }
+ }
+ }
+ }
+
private void SetSessionHandleConnectionOptions(SafeWinHttpHandle sessionHandle)
{
uint optionData = (uint)_maxConnectionsPerServer;
@@ -1153,6 +1176,7 @@ private void SetSessionHandleConnectionOptions(SafeWinHttpHandle sessionHandle)
private void SetSessionHandleTlsOptions(SafeWinHttpHandle sessionHandle)
{
+ const SslProtocols Tls13 = (SslProtocols)12288; // enum is missing in .NET Standard
uint optionData = 0;
SslProtocols sslProtocols =
(_sslProtocols == SslProtocols.None) ? SecurityProtocol.DefaultSecurityProtocols : _sslProtocols;
@@ -1184,10 +1208,13 @@ private void SetSessionHandleTlsOptions(SafeWinHttpHandle sessionHandle)
optionData |= Interop.WinHttp.WINHTTP_FLAG_SECURE_PROTOCOL_TLS1_2;
}
- // As of Win10RS5 there's no public constant for WinHTTP + TLS 1.3
- // This library builds against netstandard, which doesn't define the Tls13 enum field.
+ // Set this only if supported by WinHttp version.
+ if (s_supportsTls13.Value && (sslProtocols & Tls13) != 0)
+ {
+ optionData |= Interop.WinHttp.WINHTTP_FLAG_SECURE_PROTOCOL_TLS1_3;
+ }
- // If only unknown values (e.g. TLS 1.3) were asked for, report ERROR_INVALID_PARAMETER.
+ // If only unknown values were asked for, report ERROR_INVALID_PARAMETER.
if (optionData == 0)
{
throw WinHttpException.CreateExceptionUsingError(
@@ -1198,6 +1225,30 @@ private void SetSessionHandleTlsOptions(SafeWinHttpHandle sessionHandle)
SetWinHttpOption(sessionHandle, Interop.WinHttp.WINHTTP_OPTION_SECURE_PROTOCOLS, ref optionData);
}
+ private static bool CheckTls13Support()
+ {
+ try
+ {
+ using (var handler = new WinHttpHandler())
+ using (SafeWinHttpHandle sessionHandle = Interop.WinHttp.WinHttpOpen(
+ IntPtr.Zero,
+ Interop.WinHttp.WINHTTP_ACCESS_TYPE_NO_PROXY,
+ Interop.WinHttp.WINHTTP_NO_PROXY_NAME,
+ Interop.WinHttp.WINHTTP_NO_PROXY_BYPASS,
+ (int)Interop.WinHttp.WINHTTP_FLAG_ASYNC))
+ {
+ uint optionData = Interop.WinHttp.WINHTTP_FLAG_SECURE_PROTOCOL_TLS1_3;
+
+ handler.SetWinHttpOption(sessionHandle, Interop.WinHttp.WINHTTP_OPTION_SECURE_PROTOCOLS, ref optionData);
+ return true;
+ }
+ }
+ catch
+ {
+ return false;
+ }
+ }
+
private void SetSessionHandleTimeoutOptions(SafeWinHttpHandle sessionHandle)
{
if (!Interop.WinHttp.WinHttpSetTimeouts(
diff --git a/src/libraries/System.Net.Http.WinHttpHandler/tests/FunctionalTests/TrailingHeadersTest.cs b/src/libraries/System.Net.Http.WinHttpHandler/tests/FunctionalTests/TrailingHeadersTest.cs
index cef52465524dcf..5ac753c266ee0a 100644
--- a/src/libraries/System.Net.Http.WinHttpHandler/tests/FunctionalTests/TrailingHeadersTest.cs
+++ b/src/libraries/System.Net.Http.WinHttpHandler/tests/FunctionalTests/TrailingHeadersTest.cs
@@ -67,8 +67,10 @@ public async Task Http2GetAsync_NoTrailingHeaders_EmptyCollection()
}
}
- [ConditionalFact(nameof(TestsEnabled))]
- public async Task Http2GetAsync_MissingTrailer_TrailingHeadersAccepted()
+ [InlineData(false)]
+ [InlineData(true)]
+ [ConditionalTheory(nameof(TestsEnabled))]
+ public async Task Http2GetAsync_MissingTrailer_TrailingHeadersAccepted(bool responseHasContentLength)
{
using (Http2LoopbackServer server = Http2LoopbackServer.CreateServer())
using (HttpClient client = CreateHttpClient())
@@ -80,7 +82,14 @@ public async Task Http2GetAsync_MissingTrailer_TrailingHeadersAccepted()
int streamId = await connection.ReadRequestHeaderAsync();
// Response header.
- await connection.SendDefaultResponseHeadersAsync(streamId);
+ if (responseHasContentLength)
+ {
+ await connection.SendResponseHeadersAsync(streamId, endStream: false, headers: new[] { new HttpHeaderData("Content-Length", DataBytes.Length.ToString()) });
+ }
+ else
+ {
+ await connection.SendDefaultResponseHeadersAsync(streamId);
+ }
// Response data, missing Trailers.
await connection.WriteFrameAsync(MakeDataFrame(streamId, DataBytes));
@@ -98,8 +107,10 @@ public async Task Http2GetAsync_MissingTrailer_TrailingHeadersAccepted()
}
}
- [ConditionalFact(nameof(TestsEnabled))]
- public async Task Http2GetAsyncResponseHeadersReadOption_TrailingHeaders_Available()
+ [InlineData(false)]
+ [InlineData(true)]
+ [ConditionalTheory(nameof(TestsEnabled))]
+ public async Task Http2GetAsyncResponseHeadersReadOption_TrailingHeaders_Available(bool responseHasContentLength)
{
using (Http2LoopbackServer server = Http2LoopbackServer.CreateServer())
using (HttpClient client = CreateHttpClient())
@@ -111,7 +122,14 @@ public async Task Http2GetAsyncResponseHeadersReadOption_TrailingHeaders_Availab
int streamId = await connection.ReadRequestHeaderAsync();
// Response header.
- await connection.SendDefaultResponseHeadersAsync(streamId);
+ if (responseHasContentLength)
+ {
+ await connection.SendResponseHeadersAsync(streamId, endStream: false, headers: new[] { new HttpHeaderData("Content-Length", DataBytes.Length.ToString()) });
+ }
+ else
+ {
+ await connection.SendDefaultResponseHeadersAsync(streamId);
+ }
// Response data, missing Trailers.
await connection.WriteFrameAsync(MakeDataFrame(streamId, DataBytes));
diff --git a/src/libraries/System.Net.Http/src/ILLink/ILLink.Substitutions.mobile.xml b/src/libraries/System.Net.Http/src/ILLink/ILLink.Substitutions.mobile.xml
index 5b705abeb24bda..208bba9a30af6c 100644
--- a/src/libraries/System.Net.Http/src/ILLink/ILLink.Substitutions.mobile.xml
+++ b/src/libraries/System.Net.Http/src/ILLink/ILLink.Substitutions.mobile.xml
@@ -2,6 +2,7 @@
+
diff --git a/src/libraries/System.Net.Http/src/ILLink/ILLink.Suppressions.LibraryBuild.xml b/src/libraries/System.Net.Http/src/ILLink/ILLink.Suppressions.Mobile.LibraryBuild.xml
similarity index 96%
rename from src/libraries/System.Net.Http/src/ILLink/ILLink.Suppressions.LibraryBuild.xml
rename to src/libraries/System.Net.Http/src/ILLink/ILLink.Suppressions.Mobile.LibraryBuild.xml
index a6af29a8085c3e..d6f428f20d4e6d 100644
--- a/src/libraries/System.Net.Http/src/ILLink/ILLink.Suppressions.LibraryBuild.xml
+++ b/src/libraries/System.Net.Http/src/ILLink/ILLink.Suppressions.Mobile.LibraryBuild.xml
@@ -141,6 +141,18 @@
M:System.Net.Http.HttpClientHandler.SetMaxAutomaticRedirections(System.Int32)
The Xamarin.iOS and Mono.Android libraries are not present when running the trimmer analysis during our build. A consuming application will get a warning if these libraries aren't present when trimming the full app.
+
+ ILLink
+ IL2035
+ member
+ M:System.Net.Http.HttpClientHandler.GetServerCertificateCustomValidationCallback
+
+
+ ILLink
+ IL2035
+ member
+ M:System.Net.Http.HttpClientHandler.SetServerCertificateCustomValidationCallback(System.Func{System.Net.Http.HttpRequestMessage,System.Security.Cryptography.X509Certificates.X509Certificate2,System.Security.Cryptography.X509Certificates.X509Chain,System.Net.Security.SslPolicyErrors,System.Boolean})
+
ILLink
IL2035
diff --git a/src/libraries/System.Net.Http/src/System.Net.Http.csproj b/src/libraries/System.Net.Http/src/System.Net.Http.csproj
index 28de4bb4bb00d3..2897f5fb1505fc 100644
--- a/src/libraries/System.Net.Http/src/System.Net.Http.csproj
+++ b/src/libraries/System.Net.Http/src/System.Net.Http.csproj
@@ -12,6 +12,18 @@
$(DefineConstants);TARGET_MOBILE
+
+ $(DefineConstants);TARGET_ANDROID
+
+
+ $(DefineConstants);TARGET_IOS
+
+
+ $(DefineConstants);TARGET_MACCATALYST
+
+
+ $(DefineConstants);TARGET_TVOS
+
$(DefineConstants);TARGET_BROWSER
@@ -23,6 +35,7 @@
+
@@ -41,10 +54,8 @@
-
-
-
-
+
diff --git a/src/libraries/System.Net.Http/src/System/Net/Http/Headers/HttpHeaders.cs b/src/libraries/System.Net.Http/src/System/Net/Http/Headers/HttpHeaders.cs
index c31e628159db0e..ee53b9e626c751 100644
--- a/src/libraries/System.Net.Http/src/System/Net/Http/Headers/HttpHeaders.cs
+++ b/src/libraries/System.Net.Http/src/System/Net/Http/Headers/HttpHeaders.cs
@@ -1051,7 +1051,7 @@ private HeaderDescriptor GetHeaderDescriptor(string name)
throw new InvalidOperationException(SR.Format(SR.net_http_headers_not_allowed_header_name, name));
}
- private bool TryGetHeaderDescriptor(string name, out HeaderDescriptor descriptor)
+ internal bool TryGetHeaderDescriptor(string name, out HeaderDescriptor descriptor)
{
if (string.IsNullOrEmpty(name))
{
diff --git a/src/libraries/System.Net.Http/src/System/Net/Http/Headers/HttpHeadersNonValidated.cs b/src/libraries/System.Net.Http/src/System/Net/Http/Headers/HttpHeadersNonValidated.cs
index ad1a1850ea83c4..5e67476d116a99 100644
--- a/src/libraries/System.Net.Http/src/System/Net/Http/Headers/HttpHeadersNonValidated.cs
+++ b/src/libraries/System.Net.Http/src/System/Net/Http/Headers/HttpHeadersNonValidated.cs
@@ -32,7 +32,7 @@ namespace System.Net.Http.Headers
/// true if the collection contains the header; otherwise, false.
public bool Contains(string headerName) =>
_headers is HttpHeaders headers &&
- HeaderDescriptor.TryGet(headerName, out HeaderDescriptor descriptor) &&
+ headers.TryGetHeaderDescriptor(headerName, out HeaderDescriptor descriptor) &&
headers.TryGetHeaderValue(descriptor, out _);
/// Gets the values for the specified header name.
@@ -62,7 +62,7 @@ public HeaderStringValues this[string headerName]
public bool TryGetValues(string headerName, out HeaderStringValues values)
{
if (_headers is HttpHeaders headers &&
- HeaderDescriptor.TryGet(headerName, out HeaderDescriptor descriptor) &&
+ headers.TryGetHeaderDescriptor(headerName, out HeaderDescriptor descriptor) &&
headers.TryGetHeaderValue(descriptor, out object? info))
{
HttpHeaders.GetStoreValuesAsStringOrStringArray(descriptor, info, out string? singleValue, out string[]? multiValue);
diff --git a/src/libraries/System.Net.Http/src/System/Net/Http/Headers/ObjectCollection.cs b/src/libraries/System.Net.Http/src/System/Net/Http/Headers/ObjectCollection.cs
index e7b3c4e9522389..2486c55638697c 100644
--- a/src/libraries/System.Net.Http/src/System/Net/Http/Headers/ObjectCollection.cs
+++ b/src/libraries/System.Net.Http/src/System/Net/Http/Headers/ObjectCollection.cs
@@ -94,8 +94,9 @@ public void Clear()
}
public bool Contains(T item) =>
- ReferenceEquals(item, _items) ||
- (_size != 0 && _items is T[] items && Array.IndexOf(items, item, 0, _size) != -1);
+ _size <= 0 ? false :
+ _items is T o ? o.Equals(item) :
+ _items is T[] items && Array.IndexOf(items, item, 0, _size) != -1;
public void CopyTo(T[] array, int arrayIndex)
{
@@ -120,14 +121,16 @@ public void CopyTo(T[] array, int arrayIndex)
public bool Remove(T item)
{
- if (ReferenceEquals(_items, item))
+ if (_items is T o)
{
- _items = null;
- _size = 0;
- return true;
+ if (o.Equals(item))
+ {
+ _items = null;
+ _size = 0;
+ return true;
+ }
}
-
- if (_items is T[] items)
+ else if (_items is T[] items)
{
int index = Array.IndexOf(items, item, 0, _size);
if (index != -1)
diff --git a/src/libraries/System.Net.Http/src/System/Net/Http/HttpClientHandler.Android.cs b/src/libraries/System.Net.Http/src/System/Net/Http/HttpClientHandler.Android.cs
deleted file mode 100644
index 95face9fcdc1bb..00000000000000
--- a/src/libraries/System.Net.Http/src/System/Net/Http/HttpClientHandler.Android.cs
+++ /dev/null
@@ -1,138 +0,0 @@
-// 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 System.Diagnostics.CodeAnalysis;
-using System.Net.Security;
-using System.Reflection;
-using System.Runtime.Versioning;
-using System.Security.Authentication;
-using System.Security.Cryptography.X509Certificates;
-
-namespace System.Net.Http
-{
- public partial class HttpClientHandler : HttpMessageHandler
- {
- private static MethodInfo? _nativeHandlerMethod;
-
- private const string NativeHandlerType = "Xamarin.Android.Net.AndroidMessageHandler";
- private const string AssemblyName = "Mono.Android";
-
- [DynamicDependency("get_DefaultProxyCredentials", NativeHandlerType, AssemblyName)]
- private ICredentials? GetDefaultProxyCredentials() => (ICredentials?)InvokeNativeHandlerMethod("get_DefaultProxyCredentials");
-
- [DynamicDependency("set_DefaultProxyCredentials", NativeHandlerType, AssemblyName)]
- private void SetDefaultProxyCredentials(ICredentials? value) => InvokeNativeHandlerMethod("set_DefaultProxyCredentials", value);
-
- [DynamicDependency("get_MaxConnectionsPerServer", NativeHandlerType, AssemblyName)]
- private int GetMaxConnectionsPerServer() => (int)InvokeNativeHandlerMethod("get_MaxConnectionsPerServer");
-
- [DynamicDependency("set_MaxConnectionsPerServer", NativeHandlerType, AssemblyName)]
- private void SetMaxConnectionsPerServer(int value) => InvokeNativeHandlerMethod("set_MaxConnectionsPerServer", value);
-
- [DynamicDependency("get_MaxResponseHeadersLength", NativeHandlerType, AssemblyName)]
- private int GetMaxResponseHeadersLength() => (int)InvokeNativeHandlerMethod("get_MaxResponseHeadersLength");
-
- [DynamicDependency("set_MaxResponseHeadersLength", NativeHandlerType, AssemblyName)]
- private void SetMaxResponseHeadersLength(int value) => InvokeNativeHandlerMethod("set_MaxResponseHeadersLength", value);
-
- [DynamicDependency("get_ClientCertificateOptions", NativeHandlerType, AssemblyName)]
- private ClientCertificateOption GetClientCertificateOptions() => (ClientCertificateOption)InvokeNativeHandlerMethod("get_ClientCertificateOptions");
-
- [DynamicDependency("set_ClientCertificateOptions", NativeHandlerType, AssemblyName)]
- private void SetClientCertificateOptions(ClientCertificateOption value) => InvokeNativeHandlerMethod("set_ClientCertificateOptions", value);
-
- [DynamicDependency("get_ClientCertificates", NativeHandlerType, AssemblyName)]
- private X509CertificateCollection GetClientCertificates() => (X509CertificateCollection)InvokeNativeHandlerMethod("get_ClientCertificates");
-
- [DynamicDependency("get_CheckCertificateRevocationList", NativeHandlerType, AssemblyName)]
- private bool GetCheckCertificateRevocationList() => (bool)InvokeNativeHandlerMethod("get_CheckCertificateRevocationList");
-
- [DynamicDependency("set_CheckCertificateRevocationList", NativeHandlerType, AssemblyName)]
- private void SetCheckCertificateRevocationList(bool value) => InvokeNativeHandlerMethod("set_CheckCertificateRevocationList", value);
-
- [DynamicDependency("get_SslProtocols", NativeHandlerType, AssemblyName)]
- private SslProtocols GetSslProtocols() => (SslProtocols)InvokeNativeHandlerMethod("get_SslProtocols");
-
- [DynamicDependency("set_SslProtocols", NativeHandlerType, AssemblyName)]
- private void SetSslProtocols(SslProtocols value) => InvokeNativeHandlerMethod("set_SslProtocols", value);
-
- [DynamicDependency("get_Properties", NativeHandlerType, AssemblyName)]
- private IDictionary GetProperties() => (IDictionary)InvokeNativeHandlerMethod("get_Properties");
-
- [DynamicDependency("get_SupportsAutomaticDecompression", NativeHandlerType, AssemblyName)]
- private bool GetSupportsAutomaticDecompression() => (bool)InvokeNativeHandlerMethod("get_SupportsAutomaticDecompression");
-
- [DynamicDependency("get_SupportsProxy", NativeHandlerType, AssemblyName)]
- private bool GetSupportsProxy() => (bool)InvokeNativeHandlerMethod("get_SupportsProxy");
-
- [DynamicDependency("get_SupportsRedirectConfiguration", NativeHandlerType, AssemblyName)]
- private bool GetSupportsRedirectConfiguration() => (bool)InvokeNativeHandlerMethod("get_SupportsRedirectConfiguration");
-
- [DynamicDependency("get_MaxAutomaticRedirections", NativeHandlerType, AssemblyName)]
- private int GetMaxAutomaticRedirections() => (int)InvokeNativeHandlerMethod("get_MaxAutomaticRedirections");
-
- [DynamicDependency("set_MaxAutomaticRedirections", NativeHandlerType, AssemblyName)]
- private void SetMaxAutomaticRedirections(int value) => InvokeNativeHandlerMethod("set_MaxAutomaticRedirections", value);
-
- [DynamicDependency("get_PreAuthenticate", NativeHandlerType, AssemblyName)]
- private bool GetPreAuthenticate() => (bool)InvokeNativeHandlerMethod("get_PreAuthenticate");
-
- [DynamicDependency("set_PreAuthenticate", NativeHandlerType, AssemblyName)]
- private void SetPreAuthenticate(bool value) => InvokeNativeHandlerMethod("set_PreAuthenticate", value);
-
- [DynamicDependency("get_UseProxy", NativeHandlerType, AssemblyName)]
- private bool GetUseProxy() => (bool)InvokeNativeHandlerMethod("get_UseProxy");
-
- [DynamicDependency("set_UseProxy", NativeHandlerType, AssemblyName)]
- private void SetUseProxy(bool value) => InvokeNativeHandlerMethod("set_UseProxy", value);
-
- [DynamicDependency("get_Proxy", NativeHandlerType, AssemblyName)]
- private IWebProxy GetProxy() => (IWebProxy)InvokeNativeHandlerMethod("get_Proxy");
-
- [DynamicDependency("set_Proxy", NativeHandlerType, AssemblyName)]
- private void SetProxy(IWebProxy value) => InvokeNativeHandlerMethod("set_Proxy", value);
-
- [DynamicDependency("get_AutomaticDecompression", NativeHandlerType, AssemblyName)]
- private DecompressionMethods GetAutomaticDecompression() => (DecompressionMethods)InvokeNativeHandlerMethod("get_AutomaticDecompression");
-
- [DynamicDependency("set_AutomaticDecompression", NativeHandlerType, AssemblyName)]
- private void SetAutomaticDecompression(DecompressionMethods value) => InvokeNativeHandlerMethod("set_AutomaticDecompression", value);
-
- [DynamicDependency("get_UseCookies", NativeHandlerType, AssemblyName)]
- private bool GetUseCookies() => (bool)InvokeNativeHandlerMethod("get_UseCookies");
-
- [DynamicDependency("set_UseCookies", NativeHandlerType, AssemblyName)]
- private void SetUseCookies(bool value) => InvokeNativeHandlerMethod("set_UseCookies", value);
-
- [DynamicDependency("get_CookieContainer", NativeHandlerType, AssemblyName)]
- private CookieContainer GetCookieContainer() => (CookieContainer)InvokeNativeHandlerMethod("get_CookieContainer");
-
- [DynamicDependency("set_CookieContainer", NativeHandlerType, AssemblyName)]
- private void SetCookieContainer(CookieContainer value) => InvokeNativeHandlerMethod("set_CookieContainer", value);
-
- [DynamicDependency("get_AllowAutoRedirect", NativeHandlerType, AssemblyName)]
- private bool GetAllowAutoRedirect() => (bool)InvokeNativeHandlerMethod("get_AllowAutoRedirect");
-
- [DynamicDependency("set_AllowAutoRedirect", NativeHandlerType, AssemblyName)]
- private void SetAllowAutoRedirect(bool value) => InvokeNativeHandlerMethod("set_AllowAutoRedirect", value);
-
- [DynamicDependency("get_Credentials", NativeHandlerType, AssemblyName)]
- private ICredentials GetCredentials() => (ICredentials)InvokeNativeHandlerMethod("get_Credentials");
-
- [DynamicDependency("set_Credentials", NativeHandlerType, AssemblyName)]
- private void SetCredentials(ICredentials? value) => InvokeNativeHandlerMethod("set_Credentials", value);
-
- private HttpMessageHandler CreateNativeHandler()
- {
- if (_nativeHandlerMethod == null)
- {
- Type? androidEnv = Type.GetType("Android.Runtime.AndroidEnvironment, Mono.Android");
- _nativeHandlerMethod = androidEnv!.GetMethod("GetHttpMessageHandler", BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Static);
- }
-
- return (HttpMessageHandler)_nativeHandlerMethod!.Invoke(null, null)!;
- }
- }
-}
\ No newline at end of file
diff --git a/src/libraries/System.Net.Http/src/System/Net/Http/HttpClientHandler.tvOS.cs b/src/libraries/System.Net.Http/src/System/Net/Http/HttpClientHandler.AnyMobile.InvokeNativeHandler.cs
similarity index 81%
rename from src/libraries/System.Net.Http/src/System/Net/Http/HttpClientHandler.tvOS.cs
rename to src/libraries/System.Net.Http/src/System/Net/Http/HttpClientHandler.AnyMobile.InvokeNativeHandler.cs
index 8add42ba9752ae..d14bbbf2799cfa 100644
--- a/src/libraries/System.Net.Http/src/System/Net/Http/HttpClientHandler.tvOS.cs
+++ b/src/libraries/System.Net.Http/src/System/Net/Http/HttpClientHandler.AnyMobile.InvokeNativeHandler.cs
@@ -15,8 +15,25 @@ public partial class HttpClientHandler : HttpMessageHandler
{
private static MethodInfo? _nativeHandlerMethod;
+#if TARGET_ANDROID
+ private const string NativeHandlerType = "Xamarin.Android.Net.AndroidMessageHandler";
+ private const string AssemblyName = "Mono.Android";
+ private const string GetHttpMessageHandlerType = "Android.Runtime.AndroidEnvironment, Mono.Android";
+#elif TARGET_IOS
private const string NativeHandlerType = "System.Net.Http.NSUrlSessionHandler";
- private const string AssemblyName = "Xamarin.TVOS";
+ private const string AssemblyName = "Microsoft.iOS";
+ private const string GetHttpMessageHandlerType = "ObjCRuntime.RuntimeOptions, Microsoft.iOS";
+#elif TARGET_MACCATALYST
+ private const string NativeHandlerType = "System.Net.Http.NSUrlSessionHandler";
+ private const string AssemblyName = "Microsoft.MacCatalyst";
+ private const string GetHttpMessageHandlerType = "ObjCRuntime.RuntimeOptions, Microsoft.MacCatalyst";
+#elif TARGET_TVOS
+ private const string NativeHandlerType = "System.Net.Http.NSUrlSessionHandler";
+ private const string AssemblyName = "Microsoft.tvOS";
+ private const string GetHttpMessageHandlerType = "ObjCRuntime.RuntimeOptions, Microsoft.tvOS";
+#else
+#error Unknown target
+#endif
[DynamicDependency("get_DefaultProxyCredentials", NativeHandlerType, AssemblyName)]
private ICredentials? GetDefaultProxyCredentials() => (ICredentials?)InvokeNativeHandlerMethod("get_DefaultProxyCredentials");
@@ -45,6 +62,12 @@ public partial class HttpClientHandler : HttpMessageHandler
[DynamicDependency("get_ClientCertificates", NativeHandlerType, AssemblyName)]
private X509CertificateCollection GetClientCertificates() => (X509CertificateCollection)InvokeNativeHandlerMethod("get_ClientCertificates");
+ [DynamicDependency("get_ServerCertificateCustomValidationCallback", NativeHandlerType, AssemblyName)]
+ private Func GetServerCertificateCustomValidationCallback() => (Func)InvokeNativeHandlerMethod("get_ServerCertificateCustomValidationCallback");
+
+ [DynamicDependency("set_ServerCertificateCustomValidationCallback", NativeHandlerType, AssemblyName)]
+ private void SetServerCertificateCustomValidationCallback(Func? value) => InvokeNativeHandlerMethod("set_ServerCertificateCustomValidationCallback", value);
+
[DynamicDependency("get_CheckCertificateRevocationList", NativeHandlerType, AssemblyName)]
private bool GetCheckCertificateRevocationList() => (bool)InvokeNativeHandlerMethod("get_CheckCertificateRevocationList");
@@ -127,7 +150,7 @@ private HttpMessageHandler CreateNativeHandler()
{
if (_nativeHandlerMethod == null)
{
- Type? runtimeOptions = Type.GetType("ObjCRuntime.RuntimeOptions, Xamarin.TVOS");
+ Type? runtimeOptions = Type.GetType(GetHttpMessageHandlerType);
_nativeHandlerMethod = runtimeOptions!.GetMethod("GetHttpMessageHandler", BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Static);
}
diff --git a/src/libraries/System.Net.Http/src/System/Net/Http/HttpClientHandler.AnyMobile.cs b/src/libraries/System.Net.Http/src/System/Net/Http/HttpClientHandler.AnyMobile.cs
index e6168b48190ba6..2284b33b80a719 100644
--- a/src/libraries/System.Net.Http/src/System/Net/Http/HttpClientHandler.AnyMobile.cs
+++ b/src/libraries/System.Net.Http/src/System/Net/Http/HttpClientHandler.AnyMobile.cs
@@ -426,7 +426,7 @@ public X509CertificateCollection ClientCertificates
{
if (IsNativeHandlerEnabled)
{
- throw new PlatformNotSupportedException();
+ return GetServerCertificateCustomValidationCallback();
}
else
{
@@ -437,7 +437,7 @@ public X509CertificateCollection ClientCertificates
{
if (IsNativeHandlerEnabled)
{
- throw new PlatformNotSupportedException();
+ SetServerCertificateCustomValidationCallback(value);
}
else
{
diff --git a/src/libraries/System.Net.Http/src/System/Net/Http/HttpClientHandler.MacCatalyst.cs b/src/libraries/System.Net.Http/src/System/Net/Http/HttpClientHandler.MacCatalyst.cs
deleted file mode 100644
index 182c6b041ec909..00000000000000
--- a/src/libraries/System.Net.Http/src/System/Net/Http/HttpClientHandler.MacCatalyst.cs
+++ /dev/null
@@ -1,137 +0,0 @@
-// 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 System.Diagnostics.CodeAnalysis;
-using System.Net.Security;
-using System.Reflection;
-using System.Security.Authentication;
-using System.Security.Cryptography.X509Certificates;
-
-namespace System.Net.Http
-{
- public partial class HttpClientHandler : HttpMessageHandler
- {
- private static MethodInfo? _nativeHandlerMethod;
-
- private const string NativeHandlerType = "System.Net.Http.NSUrlSessionHandler";
- private const string AssemblyName = "Xamarin.MacCatalyst";
-
- [DynamicDependency("get_DefaultProxyCredentials", NativeHandlerType, AssemblyName)]
- private ICredentials? GetDefaultProxyCredentials() => (ICredentials?)InvokeNativeHandlerMethod("get_DefaultProxyCredentials");
-
- [DynamicDependency("set_DefaultProxyCredentials", NativeHandlerType, AssemblyName)]
- private void SetDefaultProxyCredentials(ICredentials? value) => InvokeNativeHandlerMethod("set_DefaultProxyCredentials", value);
-
- [DynamicDependency("get_MaxConnectionsPerServer", NativeHandlerType, AssemblyName)]
- private int GetMaxConnectionsPerServer() => (int)InvokeNativeHandlerMethod("get_MaxConnectionsPerServer");
-
- [DynamicDependency("set_MaxConnectionsPerServer", NativeHandlerType, AssemblyName)]
- private void SetMaxConnectionsPerServer(int value) => InvokeNativeHandlerMethod("set_MaxConnectionsPerServer", value);
-
- [DynamicDependency("get_MaxResponseHeadersLength", NativeHandlerType, AssemblyName)]
- private int GetMaxResponseHeadersLength() => (int)InvokeNativeHandlerMethod("get_MaxResponseHeadersLength");
-
- [DynamicDependency("set_MaxResponseHeadersLength", NativeHandlerType, AssemblyName)]
- private void SetMaxResponseHeadersLength(int value) => InvokeNativeHandlerMethod("set_MaxResponseHeadersLength", value);
-
- [DynamicDependency("get_ClientCertificateOptions", NativeHandlerType, AssemblyName)]
- private ClientCertificateOption GetClientCertificateOptions() => (ClientCertificateOption)InvokeNativeHandlerMethod("get_ClientCertificateOptions");
-
- [DynamicDependency("set_ClientCertificateOptions", NativeHandlerType, AssemblyName)]
- private void SetClientCertificateOptions(ClientCertificateOption value) => InvokeNativeHandlerMethod("set_ClientCertificateOptions", value);
-
- [DynamicDependency("get_ClientCertificates", NativeHandlerType, AssemblyName)]
- private X509CertificateCollection GetClientCertificates() => (X509CertificateCollection)InvokeNativeHandlerMethod("get_ClientCertificates");
-
- [DynamicDependency("get_CheckCertificateRevocationList", NativeHandlerType, AssemblyName)]
- private bool GetCheckCertificateRevocationList() => (bool)InvokeNativeHandlerMethod("get_CheckCertificateRevocationList");
-
- [DynamicDependency("set_CheckCertificateRevocationList", NativeHandlerType, AssemblyName)]
- private void SetCheckCertificateRevocationList(bool value) => InvokeNativeHandlerMethod("set_CheckCertificateRevocationList", value);
-
- [DynamicDependency("get_SslProtocols", NativeHandlerType, AssemblyName)]
- private SslProtocols GetSslProtocols() => (SslProtocols)InvokeNativeHandlerMethod("get_SslProtocols");
-
- [DynamicDependency("set_SslProtocols", NativeHandlerType, AssemblyName)]
- private void SetSslProtocols(SslProtocols value) => InvokeNativeHandlerMethod("set_SslProtocols", value);
-
- [DynamicDependency("get_Properties", NativeHandlerType, AssemblyName)]
- private IDictionary GetProperties() => (IDictionary)InvokeNativeHandlerMethod("get_Properties");
-
- [DynamicDependency("get_SupportsAutomaticDecompression", NativeHandlerType, AssemblyName)]
- private bool GetSupportsAutomaticDecompression() => (bool)InvokeNativeHandlerMethod("get_SupportsAutomaticDecompression");
-
- [DynamicDependency("get_SupportsProxy", NativeHandlerType, AssemblyName)]
- private bool GetSupportsProxy() => (bool)InvokeNativeHandlerMethod("get_SupportsProxy");
-
- [DynamicDependency("get_SupportsRedirectConfiguration", NativeHandlerType, AssemblyName)]
- private bool GetSupportsRedirectConfiguration() => (bool)InvokeNativeHandlerMethod("get_SupportsRedirectConfiguration");
-
- [DynamicDependency("get_AutomaticDecompression", NativeHandlerType, AssemblyName)]
- private DecompressionMethods GetAutomaticDecompression() => (DecompressionMethods)InvokeNativeHandlerMethod("get_AutomaticDecompression");
-
- [DynamicDependency("set_AutomaticDecompression", NativeHandlerType, AssemblyName)]
- private void SetAutomaticDecompression(DecompressionMethods value) => InvokeNativeHandlerMethod("set_AutomaticDecompression", value);
-
- [DynamicDependency("get_UseProxy", NativeHandlerType, AssemblyName)]
- private bool GetUseProxy() => (bool)InvokeNativeHandlerMethod("get_UseProxy");
-
- [DynamicDependency("set_UseProxy", NativeHandlerType, AssemblyName)]
- private void SetUseProxy(bool value) => InvokeNativeHandlerMethod("set_UseProxy", value);
-
- [DynamicDependency("get_Proxy", NativeHandlerType, AssemblyName)]
- private IWebProxy GetProxy() => (IWebProxy)InvokeNativeHandlerMethod("get_Proxy");
-
- [DynamicDependency("set_Proxy", NativeHandlerType, AssemblyName)]
- private void SetProxy(IWebProxy value) => InvokeNativeHandlerMethod("set_Proxy", value);
-
- [DynamicDependency("get_PreAuthenticate", NativeHandlerType, AssemblyName)]
- private bool GetPreAuthenticate() => (bool)InvokeNativeHandlerMethod("get_PreAuthenticate");
-
- [DynamicDependency("set_PreAuthenticate", NativeHandlerType, AssemblyName)]
- private void SetPreAuthenticate(bool value) => InvokeNativeHandlerMethod("set_PreAuthenticate", value);
-
- [DynamicDependency("get_MaxAutomaticRedirections", NativeHandlerType, AssemblyName)]
- private int GetMaxAutomaticRedirections() => (int)InvokeNativeHandlerMethod("get_MaxAutomaticRedirections");
-
- [DynamicDependency("set_MaxAutomaticRedirections", NativeHandlerType, AssemblyName)]
- private void SetMaxAutomaticRedirections(int value) => InvokeNativeHandlerMethod("set_MaxAutomaticRedirections", value);
-
- [DynamicDependency("get_UseCookies", NativeHandlerType, AssemblyName)]
- private bool GetUseCookies() => (bool)InvokeNativeHandlerMethod("get_UseCookies");
-
- [DynamicDependency("set_UseCookies", NativeHandlerType, AssemblyName)]
- private void SetUseCookies(bool value) => InvokeNativeHandlerMethod("set_UseCookies", value);
-
- [DynamicDependency("get_CookieContainer", NativeHandlerType, AssemblyName)]
- private CookieContainer GetCookieContainer() => (CookieContainer)InvokeNativeHandlerMethod("get_CookieContainer");
-
- [DynamicDependency("set_CookieContainer", NativeHandlerType, AssemblyName)]
- private void SetCookieContainer(CookieContainer value) => InvokeNativeHandlerMethod("set_CookieContainer", value);
-
- [DynamicDependency("get_AllowAutoRedirect", NativeHandlerType, AssemblyName)]
- private bool GetAllowAutoRedirect() => (bool)InvokeNativeHandlerMethod("get_AllowAutoRedirect");
-
- [DynamicDependency("set_AllowAutoRedirect", NativeHandlerType, AssemblyName)]
- private void SetAllowAutoRedirect(bool value) => InvokeNativeHandlerMethod("set_AllowAutoRedirect", value);
-
- [DynamicDependency("get_Credentials", NativeHandlerType, AssemblyName)]
- private ICredentials GetCredentials() => (ICredentials)InvokeNativeHandlerMethod("get_Credentials");
-
- [DynamicDependency("set_Credentials", NativeHandlerType, AssemblyName)]
- private void SetCredentials(ICredentials? value) => InvokeNativeHandlerMethod("set_Credentials", value);
-
- private HttpMessageHandler CreateNativeHandler()
- {
- if (_nativeHandlerMethod == null)
- {
- Type? runtimeOptions = Type.GetType("ObjCRuntime.RuntimeOptions, Xamarin.MacCatalyst");
- _nativeHandlerMethod = runtimeOptions!.GetMethod("GetHttpMessageHandler", BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Static);
- }
-
- return (HttpMessageHandler)_nativeHandlerMethod!.Invoke(null, null)!;
- }
- }
-}
\ No newline at end of file
diff --git a/src/libraries/System.Net.Http/src/System/Net/Http/HttpClientHandler.iOS.cs b/src/libraries/System.Net.Http/src/System/Net/Http/HttpClientHandler.iOS.cs
deleted file mode 100644
index 915c1c99ec6104..00000000000000
--- a/src/libraries/System.Net.Http/src/System/Net/Http/HttpClientHandler.iOS.cs
+++ /dev/null
@@ -1,137 +0,0 @@
-// 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 System.Diagnostics.CodeAnalysis;
-using System.Net.Security;
-using System.Reflection;
-using System.Security.Authentication;
-using System.Security.Cryptography.X509Certificates;
-
-namespace System.Net.Http
-{
- public partial class HttpClientHandler : HttpMessageHandler
- {
- private static MethodInfo? _nativeHandlerMethod;
-
- private const string NativeHandlerType = "System.Net.Http.NSUrlSessionHandler";
- private const string AssemblyName = "Xamarin.iOS";
-
- [DynamicDependency("get_DefaultProxyCredentials", NativeHandlerType, AssemblyName)]
- private ICredentials? GetDefaultProxyCredentials() => (ICredentials?)InvokeNativeHandlerMethod("get_DefaultProxyCredentials");
-
- [DynamicDependency("set_DefaultProxyCredentials", NativeHandlerType, AssemblyName)]
- private void SetDefaultProxyCredentials(ICredentials? value) => InvokeNativeHandlerMethod("set_DefaultProxyCredentials", value);
-
- [DynamicDependency("get_MaxConnectionsPerServer", NativeHandlerType, AssemblyName)]
- private int GetMaxConnectionsPerServer() => (int)InvokeNativeHandlerMethod("get_MaxConnectionsPerServer");
-
- [DynamicDependency("set_MaxConnectionsPerServer", NativeHandlerType, AssemblyName)]
- private void SetMaxConnectionsPerServer(int value) => InvokeNativeHandlerMethod("set_MaxConnectionsPerServer", value);
-
- [DynamicDependency("get_MaxResponseHeadersLength", NativeHandlerType, AssemblyName)]
- private int GetMaxResponseHeadersLength() => (int)InvokeNativeHandlerMethod("get_MaxResponseHeadersLength");
-
- [DynamicDependency("set_MaxResponseHeadersLength", NativeHandlerType, AssemblyName)]
- private void SetMaxResponseHeadersLength(int value) => InvokeNativeHandlerMethod("set_MaxResponseHeadersLength", value);
-
- [DynamicDependency("get_ClientCertificateOptions", NativeHandlerType, AssemblyName)]
- private ClientCertificateOption GetClientCertificateOptions() => (ClientCertificateOption)InvokeNativeHandlerMethod("get_ClientCertificateOptions");
-
- [DynamicDependency("set_ClientCertificateOptions", NativeHandlerType, AssemblyName)]
- private void SetClientCertificateOptions(ClientCertificateOption value) => InvokeNativeHandlerMethod("set_ClientCertificateOptions", value);
-
- [DynamicDependency("get_ClientCertificates", NativeHandlerType, AssemblyName)]
- private X509CertificateCollection GetClientCertificates() => (X509CertificateCollection)InvokeNativeHandlerMethod("get_ClientCertificates");
-
- [DynamicDependency("get_CheckCertificateRevocationList", NativeHandlerType, AssemblyName)]
- private bool GetCheckCertificateRevocationList() => (bool)InvokeNativeHandlerMethod("get_CheckCertificateRevocationList");
-
- [DynamicDependency("set_CheckCertificateRevocationList", NativeHandlerType, AssemblyName)]
- private void SetCheckCertificateRevocationList(bool value) => InvokeNativeHandlerMethod("set_CheckCertificateRevocationList", value);
-
- [DynamicDependency("get_SslProtocols", NativeHandlerType, AssemblyName)]
- private SslProtocols GetSslProtocols() => (SslProtocols)InvokeNativeHandlerMethod("get_SslProtocols");
-
- [DynamicDependency("set_SslProtocols", NativeHandlerType, AssemblyName)]
- private void SetSslProtocols(SslProtocols value) => InvokeNativeHandlerMethod("set_SslProtocols", value);
-
- [DynamicDependency("get_Properties", NativeHandlerType, AssemblyName)]
- private IDictionary GetProperties() => (IDictionary)InvokeNativeHandlerMethod("get_Properties");
-
- [DynamicDependency("get_SupportsAutomaticDecompression", NativeHandlerType, AssemblyName)]
- private bool GetSupportsAutomaticDecompression() => (bool)InvokeNativeHandlerMethod("get_SupportsAutomaticDecompression");
-
- [DynamicDependency("get_SupportsProxy", NativeHandlerType, AssemblyName)]
- private bool GetSupportsProxy() => (bool)InvokeNativeHandlerMethod("get_SupportsProxy");
-
- [DynamicDependency("get_AutomaticDecompression", NativeHandlerType, AssemblyName)]
- private DecompressionMethods GetAutomaticDecompression() => (DecompressionMethods)InvokeNativeHandlerMethod("get_AutomaticDecompression");
-
- [DynamicDependency("set_AutomaticDecompression", NativeHandlerType, AssemblyName)]
- private void SetAutomaticDecompression(DecompressionMethods value) => InvokeNativeHandlerMethod("set_AutomaticDecompression", value);
-
- [DynamicDependency("get_UseProxy", NativeHandlerType, AssemblyName)]
- private bool GetUseProxy() => (bool)InvokeNativeHandlerMethod("get_UseProxy");
-
- [DynamicDependency("set_UseProxy", NativeHandlerType, AssemblyName)]
- private void SetUseProxy(bool value) => InvokeNativeHandlerMethod("set_UseProxy", value);
-
- [DynamicDependency("get_Proxy", NativeHandlerType, AssemblyName)]
- private IWebProxy GetProxy() => (IWebProxy)InvokeNativeHandlerMethod("get_Proxy");
-
- [DynamicDependency("set_Proxy", NativeHandlerType, AssemblyName)]
- private void SetProxy(IWebProxy value) => InvokeNativeHandlerMethod("set_Proxy", value);
-
- [DynamicDependency("get_PreAuthenticate", NativeHandlerType, AssemblyName)]
- private bool GetPreAuthenticate() => (bool)InvokeNativeHandlerMethod("get_PreAuthenticate");
-
- [DynamicDependency("set_PreAuthenticate", NativeHandlerType, AssemblyName)]
- private void SetPreAuthenticate(bool value) => InvokeNativeHandlerMethod("set_PreAuthenticate", value);
-
- [DynamicDependency("get_MaxAutomaticRedirections", NativeHandlerType, AssemblyName)]
- private int GetMaxAutomaticRedirections() => (int)InvokeNativeHandlerMethod("get_MaxAutomaticRedirections");
-
- [DynamicDependency("set_MaxAutomaticRedirections", NativeHandlerType, AssemblyName)]
- private void SetMaxAutomaticRedirections(int value) => InvokeNativeHandlerMethod("set_MaxAutomaticRedirections", value);
-
- [DynamicDependency("get_UseCookies", NativeHandlerType, AssemblyName)]
- private bool GetUseCookies() => (bool)InvokeNativeHandlerMethod("get_UseCookies");
-
- [DynamicDependency("get_SupportsRedirectConfiguration", NativeHandlerType, AssemblyName)]
- private bool GetSupportsRedirectConfiguration() => (bool)InvokeNativeHandlerMethod("get_SupportsRedirectConfiguration");
-
- [DynamicDependency("set_UseCookies", NativeHandlerType, AssemblyName)]
- private void SetUseCookies(bool value) => InvokeNativeHandlerMethod("set_UseCookies", value);
-
- [DynamicDependency("get_CookieContainer", NativeHandlerType, AssemblyName)]
- private CookieContainer GetCookieContainer() => (CookieContainer)InvokeNativeHandlerMethod("get_CookieContainer");
-
- [DynamicDependency("set_CookieContainer", NativeHandlerType, AssemblyName)]
- private void SetCookieContainer(CookieContainer value) => InvokeNativeHandlerMethod("set_CookieContainer", value);
-
- [DynamicDependency("get_AllowAutoRedirect", NativeHandlerType, AssemblyName)]
- private bool GetAllowAutoRedirect() => (bool)InvokeNativeHandlerMethod("get_AllowAutoRedirect");
-
- [DynamicDependency("set_AllowAutoRedirect", NativeHandlerType, AssemblyName)]
- private void SetAllowAutoRedirect(bool value) => InvokeNativeHandlerMethod("set_AllowAutoRedirect", value);
-
- [DynamicDependency("get_Credentials", NativeHandlerType, AssemblyName)]
- private ICredentials GetCredentials() => (ICredentials)InvokeNativeHandlerMethod("get_Credentials");
-
- [DynamicDependency("set_Credentials", NativeHandlerType, AssemblyName)]
- private void SetCredentials(ICredentials? value) => InvokeNativeHandlerMethod("set_Credentials", value);
-
- private HttpMessageHandler CreateNativeHandler()
- {
- if (_nativeHandlerMethod == null)
- {
- Type? runtimeOptions = Type.GetType("ObjCRuntime.RuntimeOptions, Xamarin.iOS");
- _nativeHandlerMethod = runtimeOptions!.GetMethod("GetHttpMessageHandler", BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Static);
- }
-
- return (HttpMessageHandler)_nativeHandlerMethod!.Invoke(null, null)!;
- }
- }
-}
\ No newline at end of file
diff --git a/src/libraries/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/AuthenticationHelper.cs b/src/libraries/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/AuthenticationHelper.cs
index 88b3f64d0ec7a9..639e0367ba5aa7 100644
--- a/src/libraries/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/AuthenticationHelper.cs
+++ b/src/libraries/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/AuthenticationHelper.cs
@@ -206,7 +206,7 @@ private static async ValueTask TrySetDigestAuthToken(HttpRequestMessage re
private static ValueTask InnerSendAsync(HttpRequestMessage request, bool async, bool isProxyAuth, bool doRequestAuth, HttpConnectionPool pool, CancellationToken cancellationToken)
{
return isProxyAuth ?
- pool.SendWithRetryAsync(request, async, doRequestAuth, cancellationToken) :
+ pool.SendWithVersionDetectionAndRetryAsync(request, async, doRequestAuth, cancellationToken) :
pool.SendWithProxyAuthAsync(request, async, doRequestAuth, cancellationToken);
}
diff --git a/src/libraries/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/DecompressionHandler.cs b/src/libraries/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/DecompressionHandler.cs
index 0e354ff30cb0f3..939a29e06f393e 100644
--- a/src/libraries/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/DecompressionHandler.cs
+++ b/src/libraries/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/DecompressionHandler.cs
@@ -6,7 +6,6 @@
using System.IO;
using System.IO.Compression;
using System.Net.Http.Headers;
-using System.Runtime.CompilerServices;
using System.Threading;
using System.Threading.Tasks;
@@ -224,12 +223,203 @@ public DeflateDecompressedContent(HttpContent originalContent)
{ }
protected override Stream GetDecompressedStream(Stream originalStream) =>
- // As described in RFC 2616, the deflate content-coding is actually
- // the "zlib" format (RFC 1950) in combination with the "deflate"
- // compression algrithm (RFC 1951). So while potentially
- // counterintuitive based on naming, this needs to use ZLibStream
- // rather than DeflateStream.
- new ZLibStream(originalStream, CompressionMode.Decompress);
+ new ZLibOrDeflateStream(originalStream);
+
+ /// Stream that wraps either or for decompression.
+ private sealed class ZLibOrDeflateStream : HttpBaseStream
+ {
+ // As described in RFC 2616, the deflate content-coding is the "zlib" format (RFC 1950) in combination with
+ // the "deflate" compression algrithm (RFC 1951). Thus, the right stream to use here is ZLibStream. However,
+ // some servers incorrectly interpret "deflate" to mean the raw, unwrapped deflate protocol. To account for
+ // that, this switches between using ZLibStream (correct) and DeflateStream (incorrect) in order to maximize
+ // compatibility with servers.
+
+ private readonly PeekFirstByteReadStream _stream;
+ private Stream? _decompressionStream;
+
+ public ZLibOrDeflateStream(Stream stream) => _stream = new PeekFirstByteReadStream(stream);
+
+ protected override void Dispose(bool disposing)
+ {
+ if (disposing)
+ {
+ _decompressionStream?.Dispose();
+ _stream.Dispose();
+ }
+ base.Dispose(disposing);
+ }
+
+ public override bool CanRead => true;
+ public override bool CanWrite => false;
+ public override ValueTask WriteAsync(ReadOnlyMemory buffer, CancellationToken cancellationToken) => throw new NotSupportedException();
+
+ // On the first read request, peek at the first nibble of the response. If it's an 8, use ZLibStream, otherwise
+ // use DeflateStream. This heuristic works because we're deciding only between raw deflate and zlib wrapped around
+ // deflate, in which case the first nibble will always be 8 for zlib and never be 8 for deflate.
+ // https://stackoverflow.com/a/37528114 provides an explanation for why.
+
+ public override int Read(Span buffer)
+ {
+ if (_decompressionStream is null)
+ {
+ int firstByte = _stream.PeekFirstByte();
+ _decompressionStream = CreateDecompressionStream(firstByte, _stream);
+ }
+
+ return _decompressionStream.Read(buffer);
+ }
+
+ public override ValueTask ReadAsync(Memory buffer, CancellationToken cancellationToken)
+ {
+ if (_decompressionStream is null)
+ {
+ return CreateAndReadAsync(this, buffer, cancellationToken);
+
+ static async ValueTask CreateAndReadAsync(ZLibOrDeflateStream thisRef, Memory buffer, CancellationToken cancellationToken)
+ {
+ int firstByte = await thisRef._stream.PeekFirstByteAsync(cancellationToken).ConfigureAwait(false);
+ thisRef._decompressionStream = CreateDecompressionStream(firstByte, thisRef._stream);
+ return await thisRef._decompressionStream.ReadAsync(buffer, cancellationToken).ConfigureAwait(false);
+ }
+ }
+
+ return _decompressionStream.ReadAsync(buffer, cancellationToken);
+ }
+
+ public override Task CopyToAsync(Stream destination, int bufferSize, CancellationToken cancellationToken)
+ {
+ ValidateCopyToArguments(destination, bufferSize);
+ return Core(destination, bufferSize, cancellationToken);
+ async Task Core(Stream destination, int bufferSize, CancellationToken cancellationToken)
+ {
+ if (_decompressionStream is null)
+ {
+ int firstByte = await _stream.PeekFirstByteAsync(cancellationToken).ConfigureAwait(false);
+ _decompressionStream = CreateDecompressionStream(firstByte, _stream);
+ }
+
+ await _decompressionStream.CopyToAsync(destination, bufferSize, cancellationToken).ConfigureAwait(false);
+ }
+ }
+
+ private static Stream CreateDecompressionStream(int firstByte, Stream stream) =>
+ (firstByte & 0xF) == 8 ?
+ new ZLibStream(stream, CompressionMode.Decompress) :
+ new DeflateStream(stream, CompressionMode.Decompress);
+
+ private sealed class PeekFirstByteReadStream : HttpBaseStream
+ {
+ private readonly Stream _stream;
+ private byte _firstByte;
+ private FirstByteStatus _firstByteStatus;
+
+ public PeekFirstByteReadStream(Stream stream) => _stream = stream;
+
+ protected override void Dispose(bool disposing)
+ {
+ if (disposing)
+ {
+ _stream.Dispose();
+ }
+ base.Dispose(disposing);
+ }
+
+ public override bool CanRead => true;
+ public override bool CanWrite => false;
+ public override ValueTask WriteAsync(ReadOnlyMemory buffer, CancellationToken cancellationToken) => throw new NotSupportedException();
+
+ public int PeekFirstByte()
+ {
+ Debug.Assert(_firstByteStatus == FirstByteStatus.None);
+
+ int value = _stream.ReadByte();
+ if (value == -1)
+ {
+ _firstByteStatus = FirstByteStatus.Consumed;
+ return -1;
+ }
+
+ _firstByte = (byte)value;
+ _firstByteStatus = FirstByteStatus.Available;
+ return value;
+ }
+
+ public async ValueTask PeekFirstByteAsync(CancellationToken cancellationToken)
+ {
+ Debug.Assert(_firstByteStatus == FirstByteStatus.None);
+
+ var buffer = new byte[1];
+
+ int bytesRead = await _stream.ReadAsync(buffer, cancellationToken).ConfigureAwait(false);
+ if (bytesRead == 0)
+ {
+ _firstByteStatus = FirstByteStatus.Consumed;
+ return -1;
+ }
+
+ _firstByte = buffer[0];
+ _firstByteStatus = FirstByteStatus.Available;
+ return buffer[0];
+ }
+
+ public override int Read(Span buffer)
+ {
+ if (_firstByteStatus == FirstByteStatus.Available)
+ {
+ if (buffer.Length != 0)
+ {
+ buffer[0] = _firstByte;
+ _firstByteStatus = FirstByteStatus.Consumed;
+ return 1;
+ }
+
+ return 0;
+ }
+
+ Debug.Assert(_firstByteStatus == FirstByteStatus.Consumed);
+ return _stream.Read(buffer);
+ }
+
+ public override ValueTask ReadAsync(Memory buffer, CancellationToken cancellationToken)
+ {
+ if (_firstByteStatus == FirstByteStatus.Available)
+ {
+ if (buffer.Length != 0)
+ {
+ buffer.Span[0] = _firstByte;
+ _firstByteStatus = FirstByteStatus.Consumed;
+ return new ValueTask(1);
+ }
+
+ return new ValueTask(0);
+ }
+
+ Debug.Assert(_firstByteStatus == FirstByteStatus.Consumed);
+ return _stream.ReadAsync(buffer, cancellationToken);
+ }
+
+ public override async Task CopyToAsync(Stream destination, int bufferSize, CancellationToken cancellationToken)
+ {
+ Debug.Assert(_firstByteStatus != FirstByteStatus.None);
+
+ ValidateCopyToArguments(destination, bufferSize);
+ if (_firstByteStatus == FirstByteStatus.Available)
+ {
+ await destination.WriteAsync(new byte[] { _firstByte }, cancellationToken).ConfigureAwait(false);
+ _firstByteStatus = FirstByteStatus.Consumed;
+ }
+
+ await _stream.CopyToAsync(destination, bufferSize, cancellationToken).ConfigureAwait(false);
+ }
+
+ private enum FirstByteStatus : byte
+ {
+ None = 0,
+ Available = 1,
+ Consumed = 2
+ }
+ }
+ }
}
private sealed class BrotliDecompressedContent : DecompressedContent
diff --git a/src/libraries/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/Http2Connection.cs b/src/libraries/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/Http2Connection.cs
index b6a33b2f28012a..b632761f1688c1 100644
--- a/src/libraries/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/Http2Connection.cs
+++ b/src/libraries/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/Http2Connection.cs
@@ -915,6 +915,8 @@ private void ProcessPingFrame(FrameHeader frameHeader)
ReadOnlySpan pingContent = _incomingBuffer.ActiveSpan.Slice(0, FrameHeader.PingLength);
long pingContentLong = BinaryPrimitives.ReadInt64BigEndian(pingContent);
+ if (NetEventSource.Log.IsEnabled()) Trace($"Received PING frame, content:{pingContentLong} ack: {frameHeader.AckFlag}");
+
if (frameHeader.AckFlag)
{
ProcessPingAck(pingContentLong);
diff --git a/src/libraries/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/Http2StreamWindowManager.cs b/src/libraries/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/Http2StreamWindowManager.cs
index 4a1f7ee6b568a2..a9314d14ab174d 100644
--- a/src/libraries/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/Http2StreamWindowManager.cs
+++ b/src/libraries/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/Http2StreamWindowManager.cs
@@ -213,6 +213,7 @@ internal void OnDataOrHeadersReceived(Http2Connection connection)
// Send a PING
_pingCounter--;
+ if (NetEventSource.Log.IsEnabled()) connection.Trace($"[FlowControl] Sending RTT PING with payload {_pingCounter}");
connection.LogExceptions(connection.SendPingAsync(_pingCounter, isAck: false));
_pingSentTimestamp = now;
_state = State.PingSent;
@@ -223,6 +224,7 @@ internal void OnPingAckReceived(long payload, Http2Connection connection)
{
if (_state != State.PingSent && _state != State.TerminatingMayReceivePingAck)
{
+ if (NetEventSource.Log.IsEnabled()) connection.Trace($"[FlowControl] Unexpected PING ACK in state {_state}");
ThrowProtocolError();
}
@@ -236,7 +238,10 @@ internal void OnPingAckReceived(long payload, Http2Connection connection)
Debug.Assert(payload < 0);
if (_pingCounter != payload)
+ {
+ if (NetEventSource.Log.IsEnabled()) connection.Trace($"[FlowControl] Unexpected RTT PING ACK payload {payload}, should be {_pingCounter}.");
ThrowProtocolError();
+ }
RefreshRtt(connection);
_state = State.Waiting;
diff --git a/src/libraries/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/Http3RequestStream.cs b/src/libraries/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/Http3RequestStream.cs
index aa5f7541ba841b..f2beed2030f2f5 100644
--- a/src/libraries/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/Http3RequestStream.cs
+++ b/src/libraries/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/Http3RequestStream.cs
@@ -84,6 +84,7 @@ public void Dispose()
if (!_disposed)
{
_disposed = true;
+ AbortStream();
_stream.Dispose();
DisposeSyncHelper();
}
@@ -94,6 +95,7 @@ public async ValueTask DisposeAsync()
if (!_disposed)
{
_disposed = true;
+ AbortStream();
await _stream.DisposeAsync().ConfigureAwait(false);
DisposeSyncHelper();
}
@@ -365,6 +367,9 @@ private async Task SendContentAsync(HttpContent content, CancellationToken cance
await content.CopyToAsync(writeStream, null, cancellationToken).ConfigureAwait(false);
}
+ // Set to 0 to recognize that the whole request body has been sent and therefore there's no need to abort write side in case of a premature disposal.
+ _requestContentLengthRemaining = 0;
+
if (_sendBuffer.ActiveLength != 0)
{
// Our initial send buffer, which has our headers, is normally sent out on the first write to the Http3WriteStream.
@@ -1046,6 +1051,14 @@ private int ReadResponseContent(HttpResponseMessage response, Span buffer)
_responseDataPayloadRemaining -= copyLen;
_recvBuffer.Discard(copyLen);
buffer = buffer.Slice(copyLen);
+
+ // Stop, if we've reached the end of a data frame and start of the next data frame is not buffered yet
+ // Waiting for the next data frame may cause a hang, e.g. in echo scenario
+ // TODO: this is inefficient if data is already available in transport
+ if (_responseDataPayloadRemaining == 0 && _recvBuffer.ActiveLength == 0)
+ {
+ break;
+ }
}
else
{
@@ -1063,10 +1076,9 @@ private int ReadResponseContent(HttpResponseMessage response, Span buffer)
_responseDataPayloadRemaining -= bytesRead;
buffer = buffer.Slice(bytesRead);
- if (_responseDataPayloadRemaining == 0)
- {
- break;
- }
+ // Stop, even if we are in the middle of a data frame. Waiting for the next data may cause a hang
+ // TODO: this is inefficient if data is already available in transport
+ break;
}
}
@@ -1108,6 +1120,14 @@ private async ValueTask ReadResponseContentAsync(HttpResponseMessage respon
_responseDataPayloadRemaining -= copyLen;
_recvBuffer.Discard(copyLen);
buffer = buffer.Slice(copyLen);
+
+ // Stop, if we've reached the end of a data frame and start of the next data frame is not buffered yet
+ // Waiting for the next data frame may cause a hang, e.g. in echo scenario
+ // TODO: this is inefficient if data is already available in transport
+ if (_responseDataPayloadRemaining == 0 && _recvBuffer.ActiveLength == 0)
+ {
+ break;
+ }
}
else
{
@@ -1125,10 +1145,9 @@ private async ValueTask ReadResponseContentAsync(HttpResponseMessage respon
_responseDataPayloadRemaining -= bytesRead;
buffer = buffer.Slice(bytesRead);
- if (_responseDataPayloadRemaining == 0)
- {
- break;
- }
+ // Stop, even if we are in the middle of a data frame. Waiting for the next data may cause a hang
+ // TODO: this is inefficient if data is already available in transport
+ break;
}
}
@@ -1217,6 +1236,20 @@ private async ValueTask ReadNextDataFrameAsync(HttpResponseMessage respons
public void Trace(string message, [CallerMemberName] string? memberName = null) =>
_connection.Trace(StreamId, message, memberName);
+ private void AbortStream()
+ {
+ // If the request body isn't completed, cancel it now.
+ if (_requestContentLengthRemaining != 0) // 0 is used for the end of content writing, -1 is used for unknown Content-Length
+ {
+ _stream.AbortWrite((long)Http3ErrorCode.RequestCancelled);
+ }
+ // If the response body isn't completed, cancel it now.
+ if (_responseDataPayloadRemaining != -1) // -1 is used for EOF, 0 for consumed DATA frame payload before the next read
+ {
+ _stream.AbortRead((long)Http3ErrorCode.RequestCancelled);
+ }
+ }
+
// TODO: it may be possible for Http3RequestStream to implement Stream directly and avoid this allocation.
private sealed class Http3ReadStream : HttpBaseStream
{
@@ -1240,36 +1273,42 @@ public Http3ReadStream(Http3RequestStream stream)
protected override void Dispose(bool disposing)
{
- if (_stream != null)
+ Http3RequestStream? stream = Interlocked.Exchange(ref _stream, null);
+ if (stream is null)
{
- if (disposing)
- {
- // This will remove the stream from the connection properly.
- _stream.Dispose();
- }
- else
- {
- // We shouldn't be using a managed instance here, but don't have much choice -- we
- // need to remove the stream from the connection's GOAWAY collection.
- _stream._connection.RemoveStream(_stream._stream);
- _stream._connection = null!;
- }
+ return;
+ }
- _stream = null;
- _response = null;
+ if (disposing)
+ {
+ // This will remove the stream from the connection properly.
+ stream.Dispose();
+ }
+ else
+ {
+ // We shouldn't be using a managed instance here, but don't have much choice -- we
+ // need to remove the stream from the connection's GOAWAY collection.
+ stream._connection.RemoveStream(stream._stream);
+ stream._connection = null!;
}
+ _response = null;
+
base.Dispose(disposing);
}
public override async ValueTask DisposeAsync()
{
- if (_stream != null)
+ Http3RequestStream? stream = Interlocked.Exchange(ref _stream, null);
+ if (stream is null)
{
- await _stream.DisposeAsync().ConfigureAwait(false);
- _stream = null!;
+ return;
}
+ await stream.DisposeAsync().ConfigureAwait(false);
+
+ _response = null;
+
await base.DisposeAsync().ConfigureAwait(false);
}
diff --git a/src/libraries/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/HttpConnectionPool.cs b/src/libraries/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/HttpConnectionPool.cs
index 787b89c8bd7a29..c51adc80d5c301 100644
--- a/src/libraries/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/HttpConnectionPool.cs
+++ b/src/libraries/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/HttpConnectionPool.cs
@@ -413,11 +413,12 @@ private object SyncObj
// we will remove it from the list of available connections, if it is present there.
// If not, then it must be unavailable at the moment; we will detect this and ensure it is not added back to the available pool.
- private static HttpRequestException GetVersionException(HttpRequestMessage request, int desiredVersion)
+ [DoesNotReturn]
+ private static void ThrowGetVersionException(HttpRequestMessage request, int desiredVersion)
{
Debug.Assert(desiredVersion == 2 || desiredVersion == 3);
- return new HttpRequestException(SR.Format(SR.net_http_requested_version_cannot_establish, request.Version, request.VersionPolicy, desiredVersion));
+ throw new HttpRequestException(SR.Format(SR.net_http_requested_version_cannot_establish, request.Version, request.VersionPolicy, desiredVersion));
}
private bool CheckExpirationOnGet(HttpConnectionBase connection)
@@ -887,144 +888,118 @@ private async ValueTask GetHttp3ConnectionAsync(HttpRequestMess
[SupportedOSPlatform("windows")]
[SupportedOSPlatform("linux")]
[SupportedOSPlatform("macos")]
- private async ValueTask TrySendUsingHttp3Async(HttpRequestMessage request, bool async, bool doRequestAuth, CancellationToken cancellationToken)
+ private async ValueTask TrySendUsingHttp3Async(HttpRequestMessage request, bool async, CancellationToken cancellationToken)
{
- if (_http3Enabled && (request.Version.Major >= 3 || (request.VersionPolicy == HttpVersionPolicy.RequestVersionOrHigher && IsSecure)))
+ // Loop in case we get a 421 and need to send the request to a different authority.
+ while (true)
{
- // Loop in case we get a 421 and need to send the request to a different authority.
- while (true)
- {
- HttpAuthority? authority = _http3Authority;
-
- // If H3 is explicitly requested, assume prenegotiated H3.
- if (request.Version.Major >= 3 && request.VersionPolicy != HttpVersionPolicy.RequestVersionOrLower)
- {
- authority = authority ?? _originAuthority;
- }
+ HttpAuthority? authority = _http3Authority;
- if (authority == null)
- {
- break;
- }
-
- if (IsAltSvcBlocked(authority))
- {
- throw GetVersionException(request, 3);
- }
-
- Http3Connection connection = await GetHttp3ConnectionAsync(request, authority, cancellationToken).ConfigureAwait(false);
- HttpResponseMessage response = await connection.SendAsync(request, async, cancellationToken).ConfigureAwait(false);
-
- // If an Alt-Svc authority returns 421, it means it can't actually handle the request.
- // An authority is supposed to be able to handle ALL requests to the origin, so this is a server bug.
- // In this case, we blocklist the authority and retry the request at the origin.
- if (response.StatusCode == HttpStatusCode.MisdirectedRequest && connection.Authority != _originAuthority)
- {
- response.Dispose();
- BlocklistAuthority(connection.Authority);
- continue;
- }
-
- return response;
+ // If H3 is explicitly requested, assume prenegotiated H3.
+ if (request.Version.Major >= 3 && request.VersionPolicy != HttpVersionPolicy.RequestVersionOrLower)
+ {
+ authority ??= _originAuthority;
}
- }
-
- return null;
- }
- // Returns null if HTTP2 cannot be used.
- private async ValueTask TrySendUsingHttp2Async(HttpRequestMessage request, bool async, bool doRequestAuth, CancellationToken cancellationToken)
- {
- // Send using HTTP/2 if we can.
- if (_http2Enabled && (request.Version.Major >= 2 || (request.VersionPolicy == HttpVersionPolicy.RequestVersionOrHigher && IsSecure)) &&
- // If the connection is not secured and downgrade is possible, prefer HTTP/1.1.
- (request.VersionPolicy != HttpVersionPolicy.RequestVersionOrLower || IsSecure))
- {
- Http2Connection? connection = await GetHttp2ConnectionAsync(request, async, cancellationToken).ConfigureAwait(false);
- if (connection is null)
+ if (authority == null)
{
- Debug.Assert(!_http2Enabled);
return null;
}
- return await connection.SendAsync(request, async, cancellationToken).ConfigureAwait(false);
- }
-
- return null;
- }
-
- private async ValueTask SendUsingHttp11Async(HttpRequestMessage request, bool async, bool doRequestAuth, CancellationToken cancellationToken)
- {
- HttpConnection connection = await GetHttp11ConnectionAsync(request, async, cancellationToken).ConfigureAwait(false);
-
- // In case we are doing Windows (i.e. connection-based) auth, we need to ensure that we hold on to this specific connection while auth is underway.
- connection.Acquire();
- try
- {
- return await SendWithNtConnectionAuthAsync(connection, request, async, doRequestAuth, cancellationToken).ConfigureAwait(false);
- }
- finally
- {
- connection.Release();
- }
- }
+ if (IsAltSvcBlocked(authority))
+ {
+ ThrowGetVersionException(request, 3);
+ }
- private async ValueTask DetermineVersionAndSendAsync(HttpRequestMessage request, bool async, bool doRequestAuth, CancellationToken cancellationToken)
- {
- HttpResponseMessage? response;
+ Http3Connection connection = await GetHttp3ConnectionAsync(request, authority, cancellationToken).ConfigureAwait(false);
+ HttpResponseMessage response = await connection.SendAsync(request, async, cancellationToken).ConfigureAwait(false);
- if (IsHttp3Supported())
- {
- response = await TrySendUsingHttp3Async(request, async, doRequestAuth, cancellationToken).ConfigureAwait(false);
- if (response is not null)
+ // If an Alt-Svc authority returns 421, it means it can't actually handle the request.
+ // An authority is supposed to be able to handle ALL requests to the origin, so this is a server bug.
+ // In this case, we blocklist the authority and retry the request at the origin.
+ if (response.StatusCode == HttpStatusCode.MisdirectedRequest && connection.Authority != _originAuthority)
{
- return response;
+ response.Dispose();
+ BlocklistAuthority(connection.Authority);
+ continue;
}
- }
-
- // We cannot use HTTP/3. Do not continue if downgrade is not allowed.
- if (request.Version.Major >= 3 && request.VersionPolicy != HttpVersionPolicy.RequestVersionOrLower)
- {
- throw GetVersionException(request, 3);
- }
- response = await TrySendUsingHttp2Async(request, async, doRequestAuth, cancellationToken).ConfigureAwait(false);
- if (response is not null)
- {
return response;
}
-
- // We cannot use HTTP/2. Do not continue if downgrade is not allowed.
- if (request.Version.Major >= 2 && request.VersionPolicy != HttpVersionPolicy.RequestVersionOrLower)
- {
- throw GetVersionException(request, 2);
- }
-
- return await SendUsingHttp11Async(request, async, doRequestAuth, cancellationToken).ConfigureAwait(false);
}
- private async ValueTask SendAndProcessAltSvcAsync(HttpRequestMessage request, bool async, bool doRequestAuth, CancellationToken cancellationToken)
+ /// Check for the Alt-Svc header, to upgrade to HTTP/3.
+ private void ProcessAltSvc(HttpResponseMessage response)
{
- HttpResponseMessage response = await DetermineVersionAndSendAsync(request, async, doRequestAuth, cancellationToken).ConfigureAwait(false);
-
- // Check for the Alt-Svc header, to upgrade to HTTP/3.
if (_altSvcEnabled && response.Headers.TryGetValues(KnownHeaders.AltSvc.Descriptor, out IEnumerable? altSvcHeaderValues))
{
HandleAltSvc(altSvcHeaderValues, response.Headers.Age);
}
-
- return response;
}
- public async ValueTask SendWithRetryAsync(HttpRequestMessage request, bool async, bool doRequestAuth, CancellationToken cancellationToken)
+ public async ValueTask SendWithVersionDetectionAndRetryAsync(HttpRequestMessage request, bool async, bool doRequestAuth, CancellationToken cancellationToken)
{
+ // Loop on connection failures (or other problems like version downgrade) and retry if possible.
int retryCount = 0;
while (true)
{
- // Loop on connection failures (or other problems like version downgrade) and retry if possible.
try
{
- return await SendAndProcessAltSvcAsync(request, async, doRequestAuth, cancellationToken).ConfigureAwait(false);
+ HttpResponseMessage? response = null;
+
+ // Use HTTP/3 if possible.
+ if (IsHttp3Supported() && // guard to enable trimming HTTP/3 support
+ _http3Enabled &&
+ (request.Version.Major >= 3 || (request.VersionPolicy == HttpVersionPolicy.RequestVersionOrHigher && IsSecure)))
+ {
+ response = await TrySendUsingHttp3Async(request, async, cancellationToken).ConfigureAwait(false);
+ }
+
+ if (response is null)
+ {
+ // We could not use HTTP/3. Do not continue if downgrade is not allowed.
+ if (request.Version.Major >= 3 && request.VersionPolicy != HttpVersionPolicy.RequestVersionOrLower)
+ {
+ ThrowGetVersionException(request, 3);
+ }
+
+ // Use HTTP/2 if possible.
+ if (_http2Enabled &&
+ (request.Version.Major >= 2 || (request.VersionPolicy == HttpVersionPolicy.RequestVersionOrHigher && IsSecure)) &&
+ (request.VersionPolicy != HttpVersionPolicy.RequestVersionOrLower || IsSecure)) // prefer HTTP/1.1 if connection is not secured and downgrade is possible
+ {
+ Http2Connection? connection = await GetHttp2ConnectionAsync(request, async, cancellationToken).ConfigureAwait(false);
+ Debug.Assert(connection is not null || !_http2Enabled);
+ if (connection is not null)
+ {
+ response = await connection.SendAsync(request, async, cancellationToken).ConfigureAwait(false);
+ }
+ }
+
+ if (response is null)
+ {
+ // We could not use HTTP/2. Do not continue if downgrade is not allowed.
+ if (request.Version.Major >= 2 && request.VersionPolicy != HttpVersionPolicy.RequestVersionOrLower)
+ {
+ ThrowGetVersionException(request, 2);
+ }
+
+ // Use HTTP/1.x.
+ HttpConnection connection = await GetHttp11ConnectionAsync(request, async, cancellationToken).ConfigureAwait(false);
+ connection.Acquire(); // In case we are doing Windows (i.e. connection-based) auth, we need to ensure that we hold on to this specific connection while auth is underway.
+ try
+ {
+ response = await SendWithNtConnectionAuthAsync(connection, request, async, doRequestAuth, cancellationToken).ConfigureAwait(false);
+ }
+ finally
+ {
+ connection.Release();
+ }
+ }
+ }
+
+ ProcessAltSvc(response);
+ return response;
}
catch (HttpRequestException e) when (e.AllowRetry == RequestRetryType.RetryOnConnectionFailure)
{
@@ -1332,7 +1307,7 @@ public ValueTask SendWithProxyAuthAsync(HttpRequestMessage
return AuthenticationHelper.SendWithProxyAuthAsync(request, _proxyUri!, async, ProxyCredentials, doRequestAuth, this, cancellationToken);
}
- return SendWithRetryAsync(request, async, doRequestAuth, cancellationToken);
+ return SendWithVersionDetectionAndRetryAsync(request, async, doRequestAuth, cancellationToken);
}
public ValueTask SendAsync(HttpRequestMessage request, bool async, bool doRequestAuth, CancellationToken cancellationToken)
@@ -2004,7 +1979,12 @@ public bool CleanCacheAndDisposeIfUnused()
}
// Dispose the stale connections outside the pool lock, to avoid holding the lock too long.
- toDispose?.ForEach(c => c.Dispose());
+ // Dispose them asynchronously to not to block the caller on closing the SslStream or NetworkStream.
+ if (toDispose is not null)
+ {
+ Task.Factory.StartNew(static s => ((List)s!).ForEach(c => c.Dispose()), toDispose,
+ CancellationToken.None, TaskCreationOptions.DenyChildAttach, TaskScheduler.Default);
+ }
// Pool is active. Should not be removed.
return false;
@@ -2024,7 +2004,8 @@ static int ScavengeConnectionList(List list, ref List?
if (freeIndex < list.Count)
{
// We know the connection at freeIndex is unusable, so dispose of it.
- toDispose ??= new List { list[freeIndex] };
+ toDispose ??= new List();
+ toDispose.Add(list[freeIndex]);
// Find the first item after the one to be removed that should be kept.
int current = freeIndex + 1;
diff --git a/src/libraries/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/HttpConnectionPoolManager.cs b/src/libraries/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/HttpConnectionPoolManager.cs
index e257cb4c3e692f..f118d151c692ae 100644
--- a/src/libraries/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/HttpConnectionPoolManager.cs
+++ b/src/libraries/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/HttpConnectionPoolManager.cs
@@ -462,7 +462,7 @@ private void SetCleaningTimer(TimeSpan timeout)
{
try
{
- _cleaningTimer!.Change(timeout, timeout);
+ _cleaningTimer!.Change(timeout, Timeout.InfiniteTimeSpan);
_timerIsRunning = timeout != Timeout.InfiniteTimeSpan;
}
catch (ObjectDisposedException)
@@ -492,13 +492,10 @@ private void RemoveStalePools()
}
}
- // Stop running the timer if we don't have any pools to clean up.
+ // Restart the timer if we have any pools to clean up.
lock (SyncObj)
{
- if (_pools.IsEmpty)
- {
- SetCleaningTimer(Timeout.InfiniteTimeSpan);
- }
+ SetCleaningTimer(!_pools.IsEmpty ? _cleanPoolTimeout : Timeout.InfiniteTimeSpan);
}
// NOTE: There is a possible race condition with regards to a pool getting cleaned up at the same
diff --git a/src/libraries/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/HttpConnectionSettings.cs b/src/libraries/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/HttpConnectionSettings.cs
index 410acc16b69ad4..64476aa0286631 100644
--- a/src/libraries/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/HttpConnectionSettings.cs
+++ b/src/libraries/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/HttpConnectionSettings.cs
@@ -75,8 +75,6 @@ public HttpConnectionSettings()
allowHttp3 && allowHttp2 ? HttpVersion.Version30 :
allowHttp2 ? HttpVersion.Version20 :
HttpVersion.Version11;
- _defaultCredentialsUsedForProxy = _proxy != null && (_proxy.Credentials == CredentialCache.DefaultCredentials || _defaultProxyCredentials == CredentialCache.DefaultCredentials);
- _defaultCredentialsUsedForServer = _credentials == CredentialCache.DefaultCredentials;
}
/// Creates a copy of the settings but with some values normalized to suit the implementation.
@@ -96,8 +94,6 @@ public HttpConnectionSettings CloneAndNormalize()
_connectTimeout = _connectTimeout,
_credentials = _credentials,
_defaultProxyCredentials = _defaultProxyCredentials,
- _defaultCredentialsUsedForProxy = _defaultCredentialsUsedForProxy,
- _defaultCredentialsUsedForServer = _defaultCredentialsUsedForServer,
_expect100ContinueTimeout = _expect100ContinueTimeout,
_maxAutomaticRedirections = _maxAutomaticRedirections,
_maxConnectionsPerServer = _maxConnectionsPerServer,
@@ -123,6 +119,8 @@ public HttpConnectionSettings CloneAndNormalize()
_plaintextStreamFilter = _plaintextStreamFilter,
_initialHttp2StreamWindowSize = _initialHttp2StreamWindowSize,
_activityHeadersPropagator = _activityHeadersPropagator,
+ _defaultCredentialsUsedForProxy = _proxy != null && (_proxy.Credentials == CredentialCache.DefaultCredentials || _defaultProxyCredentials == CredentialCache.DefaultCredentials),
+ _defaultCredentialsUsedForServer = _credentials == CredentialCache.DefaultCredentials,
};
// TODO: Remove if/when QuicImplementationProvider is removed from System.Net.Quic.
diff --git a/src/libraries/System.Net.Http/tests/FunctionalTests/HttpClientHandlerTest.Http3.cs b/src/libraries/System.Net.Http/tests/FunctionalTests/HttpClientHandlerTest.Http3.cs
index 547f91d3e9143b..2299a5af6840b0 100644
--- a/src/libraries/System.Net.Http/tests/FunctionalTests/HttpClientHandlerTest.Http3.cs
+++ b/src/libraries/System.Net.Http/tests/FunctionalTests/HttpClientHandlerTest.Http3.cs
@@ -319,6 +319,119 @@ public async Task ReservedFrameType_Throws()
await new[] { clientTask, serverTask }.WhenAllOrAnyFailed(20_000);
}
+ [Fact]
+ public async Task RequestSentResponseDisposed_ThrowsOnServer()
+ {
+ byte[] data = Encoding.UTF8.GetBytes(new string('a', 1024));
+
+ using Http3LoopbackServer server = CreateHttp3LoopbackServer();
+
+ Task serverTask = Task.Run(async () =>
+ {
+ using Http3LoopbackConnection connection = (Http3LoopbackConnection)await server.EstablishGenericConnectionAsync();
+ using Http3LoopbackStream stream = await connection.AcceptRequestStreamAsync();
+ HttpRequestData request = await stream.ReadRequestDataAsync();
+ await stream.SendResponseHeadersAsync();
+
+ Stopwatch sw = Stopwatch.StartNew();
+ bool hasFailed = false;
+ while (sw.Elapsed < TimeSpan.FromSeconds(15))
+ {
+ try
+ {
+ await stream.SendResponseBodyAsync(data, isFinal: false);
+ }
+ catch (QuicStreamAbortedException)
+ {
+ hasFailed = true;
+ break;
+ }
+ }
+ Assert.True(hasFailed, $"Expected {nameof(QuicStreamAbortedException)}, instead ran successfully for {sw.Elapsed}");
+ });
+
+ Task clientTask = Task.Run(async () =>
+ {
+ using HttpClient client = CreateHttpClient();
+ using HttpRequestMessage request = new()
+ {
+ Method = HttpMethod.Get,
+ RequestUri = server.Address,
+ Version = HttpVersion30,
+ VersionPolicy = HttpVersionPolicy.RequestVersionExact
+ };
+
+ var response = await client.SendAsync(request, HttpCompletionOption.ResponseHeadersRead);
+ var stream = await response.Content.ReadAsStreamAsync();
+ byte[] buffer = new byte[512];
+ for (int i = 0; i < 5; ++i)
+ {
+ var count = await stream.ReadAsync(buffer);
+ }
+
+ // We haven't finished reading the whole respose, but we're disposing it, which should turn into an exception on the server-side.
+ response.Dispose();
+ await serverTask;
+ });
+
+ await new[] { clientTask, serverTask }.WhenAllOrAnyFailed(20_000);
+ }
+
+ [Fact]
+ public async Task RequestSendingResponseDisposed_ThrowsOnServer()
+ {
+ byte[] data = Encoding.UTF8.GetBytes(new string('a', 1024));
+
+ using Http3LoopbackServer server = CreateHttp3LoopbackServer();
+
+ Task serverTask = Task.Run(async () =>
+ {
+ using Http3LoopbackConnection connection = (Http3LoopbackConnection)await server.EstablishGenericConnectionAsync();
+ using Http3LoopbackStream stream = await connection.AcceptRequestStreamAsync();
+ HttpRequestData request = await stream.ReadRequestDataAsync(false);
+ await stream.SendResponseHeadersAsync();
+
+ Stopwatch sw = Stopwatch.StartNew();
+ bool hasFailed = false;
+ while (sw.Elapsed < TimeSpan.FromSeconds(15))
+ {
+ try
+ {
+ var (frameType, payload) = await stream.ReadFrameAsync();
+ Assert.Equal(Http3LoopbackStream.DataFrame, frameType);
+ }
+ catch (QuicStreamAbortedException)
+ {
+ hasFailed = true;
+ break;
+ }
+ }
+ Assert.True(hasFailed, $"Expected {nameof(QuicStreamAbortedException)}, instead ran successfully for {sw.Elapsed}");
+ });
+
+ Task clientTask = Task.Run(async () =>
+ {
+ using HttpClient client = CreateHttpClient();
+ using HttpRequestMessage request = new()
+ {
+ Method = HttpMethod.Get,
+ RequestUri = server.Address,
+ Version = HttpVersion30,
+ VersionPolicy = HttpVersionPolicy.RequestVersionExact,
+ Content = new ByteAtATimeContent(60*4, Task.CompletedTask, new TaskCompletionSource(), 250)
+ };
+
+ var response = await client.SendAsync(request, HttpCompletionOption.ResponseHeadersRead);
+ var stream = await response.Content.ReadAsStreamAsync();
+
+ // We haven't finished sending the whole request, but we're disposing the response, which should turn into an exception on the server-side.
+ response.Dispose();
+ await serverTask;
+ });
+
+ await new[] { clientTask, serverTask }.WhenAllOrAnyFailed(20_000);
+ }
+
[Fact]
public async Task ServerCertificateCustomValidationCallback_Succeeds()
{
@@ -885,7 +998,7 @@ public async Task StatusCodes_ReceiveSuccess(HttpStatusCode statusCode, bool qpa
VersionPolicy = HttpVersionPolicy.RequestVersionExact
};
HttpResponseMessage response = await client.SendAsync(request).WaitAsync(TimeSpan.FromSeconds(10));
-
+
Assert.Equal(statusCode, response.StatusCode);
await serverTask;
@@ -893,6 +1006,90 @@ public async Task StatusCodes_ReceiveSuccess(HttpStatusCode statusCode, bool qpa
connection.Dispose();
}
+ [Theory]
+ [InlineData(1)] // frame fits into Http3RequestStream buffer
+ [InlineData(10)]
+ [InlineData(100)] // frame doesn't fit into Http3RequestStream buffer
+ [InlineData(1000)]
+ public async Task EchoServerStreaming_DifferentMessageSize_Success(int messageSize)
+ {
+ int iters = 5;
+ var message = new byte[messageSize];
+ var readBuffer = new byte[5 * messageSize]; // bigger than message
+ var random = new Random(0);
+
+ using Http3LoopbackServer server = CreateHttp3LoopbackServer();
+ Http3LoopbackConnection connection = null;
+ Http3LoopbackStream serverStream = null;
+
+ Task serverTask = Task.Run(async () =>
+ {
+ connection = (Http3LoopbackConnection)await server.EstablishGenericConnectionAsync();
+ serverStream = await connection.AcceptRequestStreamAsync();
+
+ HttpRequestData requestData = await serverStream.ReadRequestDataAsync(readBody: false).WaitAsync(TimeSpan.FromSeconds(30));
+
+ await serverStream.SendResponseHeadersAsync().ConfigureAwait(false);
+
+ while (true)
+ {
+ (long? frameType, byte[] payload) = await serverStream.ReadFrameAsync();
+ if (frameType == null)
+ {
+ // EOS
+ break;
+ }
+ // echo back
+ await serverStream.SendDataFrameAsync(payload).WaitAsync(TimeSpan.FromSeconds(30));
+ }
+ // send FIN
+ await serverStream.SendResponseBodyAsync(Array.Empty(), isFinal: true);
+ });
+
+ StreamingHttpContent requestContent = new StreamingHttpContent();
+
+ using HttpClient client = CreateHttpClient();
+ using HttpRequestMessage request = new()
+ {
+ Method = HttpMethod.Post,
+ RequestUri = server.Address,
+ Version = HttpVersion30,
+ VersionPolicy = HttpVersionPolicy.RequestVersionExact,
+ Content = requestContent
+ };
+
+ var responseTask = client.SendAsync(request, HttpCompletionOption.ResponseHeadersRead).WaitAsync(TimeSpan.FromSeconds(10));
+
+ Stream requestStream = await requestContent.GetStreamAsync();
+ // Send headers
+ await requestStream.FlushAsync();
+
+ using HttpResponseMessage response = await responseTask;
+
+ var responseStream = await response.Content.ReadAsStreamAsync();
+
+ for (int i = 0; i < iters; ++i)
+ {
+ random.NextBytes(message);
+ await requestStream.WriteAsync(message).AsTask().WaitAsync(TimeSpan.FromSeconds(10));
+ await requestStream.FlushAsync();
+
+ int bytesRead = await responseStream.ReadAsync(readBuffer).AsTask().WaitAsync(TimeSpan.FromSeconds(10));
+ Assert.Equal(bytesRead, messageSize);
+ Assert.Equal(message, readBuffer[..bytesRead]);
+ }
+ // Send FIN
+ requestContent.CompleteStream();
+ // Receive FIN
+ Assert.Equal(0, await responseStream.ReadAsync(readBuffer).AsTask().WaitAsync(TimeSpan.FromSeconds(10)));
+
+ await serverTask.WaitAsync(TimeSpan.FromSeconds(60));
+
+ serverStream.Dispose();
+ Assert.NotNull(connection);
+ connection.Dispose();
+ }
+
public static TheoryData StatusCodesTestData()
{
var statuses = Enum.GetValues(typeof(HttpStatusCode)).Cast().Where(s => s >= HttpStatusCode.OK); // exclude informational
diff --git a/src/libraries/System.Net.Http/tests/FunctionalTests/ImpersonatedAuthTests.cs b/src/libraries/System.Net.Http/tests/FunctionalTests/ImpersonatedAuthTests.cs
new file mode 100644
index 00000000000000..32f44d5e00f705
--- /dev/null
+++ b/src/libraries/System.Net.Http/tests/FunctionalTests/ImpersonatedAuthTests.cs
@@ -0,0 +1,93 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Linq;
+using System.Net.Security;
+using System.Net.Test.Common;
+using System.Security.Principal;
+using System.Threading.Tasks;
+
+using Xunit;
+using Xunit.Abstractions;
+
+namespace System.Net.Http.Functional.Tests
+{
+ public class ImpersonatedAuthTests: IClassFixture
+ {
+ private readonly WindowsIdentityFixture _fixture;
+ private readonly ITestOutputHelper _output;
+
+ public ImpersonatedAuthTests(WindowsIdentityFixture windowsIdentityFixture, ITestOutputHelper output)
+ {
+ _output = output;
+ _fixture = windowsIdentityFixture;
+
+ Assert.False(_fixture.TestAccount.AccountTokenHandle.IsInvalid);
+ Assert.False(string.IsNullOrEmpty(_fixture.TestAccount.AccountName));
+ }
+
+ [OuterLoop]
+ [ConditionalTheory(typeof(PlatformDetection), nameof(PlatformDetection.CanRunImpersonatedTests))]
+ [InlineData(true)]
+ [InlineData(false)]
+ [PlatformSpecific(TestPlatforms.Windows)]
+ public async Task DefaultHandler_ImpersonatedUser_Success(bool useNtlm)
+ {
+ await LoopbackServer.CreateClientAndServerAsync(
+ async uri =>
+ {
+ HttpRequestMessage requestMessage = new HttpRequestMessage(HttpMethod.Get, uri);
+ requestMessage.Version = new Version(1, 1);
+
+ var handler = new HttpClientHandler();
+ handler.UseDefaultCredentials = true;
+
+ using (var client = new HttpClient(handler))
+ {
+ HttpResponseMessage response = await client.SendAsync(requestMessage);
+ Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+ Assert.Equal("foo", await response.Content.ReadAsStringAsync());
+
+ string initialUser = response.Headers.GetValues(NtAuthTests.UserHeaderName).First();
+
+ _output.WriteLine($"Starting test as {WindowsIdentity.GetCurrent().Name}");
+
+ // get token and run another request as different user.
+ WindowsIdentity.RunImpersonated(_fixture.TestAccount.AccountTokenHandle, () =>
+ {
+ _output.WriteLine($"Running test as {WindowsIdentity.GetCurrent().Name}");
+ Assert.Equal(_fixture.TestAccount.AccountName, WindowsIdentity.GetCurrent().Name);
+
+ requestMessage = new HttpRequestMessage(HttpMethod.Get, uri);
+ requestMessage.Version = new Version(1, 1);
+
+ HttpResponseMessage response = client.SendAsync(requestMessage).GetAwaiter().GetResult();
+ Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+ Assert.Equal("foo", response.Content.ReadAsStringAsync().GetAwaiter().GetResult());
+
+ string newUser = response.Headers.GetValues(NtAuthTests.UserHeaderName).First();
+ Assert.Equal(_fixture.TestAccount.AccountName, newUser);
+ });
+ }
+ },
+ async server =>
+ {
+ await server.AcceptConnectionAsync(async connection =>
+ {
+ Task t = useNtlm ? NtAuthTests.HandleNtlmAuthenticationRequest(connection, closeConnection: false) : NtAuthTests.HandleNegotiateAuthenticationRequest(connection, closeConnection: false);
+ await t;
+ _output.WriteLine("Finished first request");
+
+ // Second request should use new connection as it runs as different user.
+ // We keep first connection open so HttpClient may be tempted top use it.
+ await server.AcceptConnectionAsync(async connection =>
+ {
+ Task t = useNtlm ? NtAuthTests.HandleNtlmAuthenticationRequest(connection, closeConnection: false) : NtAuthTests.HandleNegotiateAuthenticationRequest(connection, closeConnection: false);
+ await t;
+ }).ConfigureAwait(false);
+ }).ConfigureAwait(false);
+ });
+
+ }
+ }
+}
diff --git a/src/libraries/System.Net.Http/tests/FunctionalTests/NtAuthTests.Windows.cs b/src/libraries/System.Net.Http/tests/FunctionalTests/NtAuthTests.Windows.cs
new file mode 100644
index 00000000000000..8bb4df5747efcd
--- /dev/null
+++ b/src/libraries/System.Net.Http/tests/FunctionalTests/NtAuthTests.Windows.cs
@@ -0,0 +1,153 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Linq;
+using System.Net.Security;
+using System.Net.Test.Common;
+using System.Security.Principal;
+using System.Threading.Tasks;
+
+using Xunit;
+using Xunit.Abstractions;
+
+namespace System.Net.Http.Functional.Tests
+{
+ public partial class NtAuthTests : IClassFixture
+ {
+ internal const string NtlmAuthHeader = "WWW-Authenticate: NTLM";
+ internal const string NegotiateAuthHeader = "WWW-Authenticate: Negotiate";
+ internal const string UserHeaderName = "X-User";
+
+ internal static Task HandleNtlmAuthenticationRequest(LoopbackServer.Connection connection, bool closeConnection = true)
+ {
+ return HandleAuthenticationRequest(connection, useNtlm: true, useNegotiate: false, closeConnection);
+ }
+
+ internal static Task HandleNegotiateAuthenticationRequest(LoopbackServer.Connection connection, bool closeConnection = true)
+ {
+ return HandleAuthenticationRequest(connection, useNtlm: false, useNegotiate: true, closeConnection);
+ }
+
+ internal static async Task HandleAuthenticationRequest(LoopbackServer.Connection connection, bool useNtlm, bool useNegotiate, bool closeConnection)
+ {
+ HttpRequestData request = await connection.ReadRequestDataAsync();
+ NTAuthentication authContext = null;
+ string authHeader = null;
+
+ foreach (HttpHeaderData header in request.Headers)
+ {
+ if (header.Name == "Authorization")
+ {
+ authHeader = header.Value;
+ break;
+ }
+ }
+
+ if (string.IsNullOrEmpty(authHeader))
+ {
+ // This is initial request, we reject with showing supported mechanisms.
+ authHeader = string.Empty;
+ if (useNtlm)
+ {
+ authHeader += NtlmAuthHeader + "\r\n";
+ }
+
+ if (useNegotiate)
+ {
+ authHeader += NegotiateAuthHeader + "\r\n";
+ }
+
+ await connection.SendResponseAsync(HttpStatusCode.Unauthorized, authHeader).ConfigureAwait(false);
+ connection.CompleteRequestProcessing();
+
+ // Read next requests and fall-back to loop bellow to process it.
+ request = await connection.ReadRequestDataAsync();
+ }
+
+ SecurityStatusPal statusCode;
+ do
+ {
+ foreach (HttpHeaderData header in request.Headers)
+ {
+ if (header.Name == "Authorization")
+ {
+ authHeader = header.Value;
+ break;
+ }
+ }
+
+ Assert.NotNull(authHeader);
+ var tokens = authHeader.Split(' ', 2, StringSplitOptions.TrimEntries);
+ // Should be type and base64 encoded blob
+ Assert.Equal(2, tokens.Length);
+
+ authContext ??= new NTAuthentication(isServer: true, tokens[0], CredentialCache.DefaultNetworkCredentials, null, ContextFlagsPal.Connection, null);
+
+ byte[]? outBlob = authContext.GetOutgoingBlob(Convert.FromBase64String(tokens[1]), throwOnError: false, out statusCode);
+
+ if (outBlob != null && statusCode.ErrorCode == SecurityStatusPalErrorCode.ContinueNeeded)
+ {
+ authHeader = $"WWW-Authenticate: {tokens[0]} {Convert.ToBase64String(outBlob)}\r\n";
+ await connection.SendResponseAsync(HttpStatusCode.Unauthorized, authHeader);
+ connection.CompleteRequestProcessing();
+
+ request = await connection.ReadRequestDataAsync();
+ }
+ }
+ while (statusCode.ErrorCode == SecurityStatusPalErrorCode.ContinueNeeded);
+
+ if (statusCode.ErrorCode == SecurityStatusPalErrorCode.OK)
+ {
+ // If authentication succeeded ask Windows about the identity and send it back as custom header.
+ SecurityContextTokenHandle? userContext = null;
+ using SafeDeleteContext securityContext = authContext.GetContext(out SecurityStatusPal statusCodeNew)!;
+ SSPIWrapper.QuerySecurityContextToken(GlobalSSPI.SSPIAuth, securityContext, out userContext);
+ using WindowsIdentity identity = new WindowsIdentity(userContext.DangerousGetHandle(), authContext.ProtocolName);
+
+ authHeader = $"{UserHeaderName}: {identity.Name}\r\n";
+ if (closeConnection)
+ {
+ authHeader += "Connection: close\r\n";
+ }
+
+ await connection.SendResponseAsync(HttpStatusCode.OK, authHeader, "foo");
+ userContext.Dispose();
+ }
+ else
+ {
+ await connection.SendResponseAsync(HttpStatusCode.Forbidden, "Connection: close\r\n", "boo");
+ }
+ }
+
+ [ConditionalTheory(typeof(PlatformDetection), nameof(PlatformDetection.IsWindows), nameof(PlatformDetection.IsNotWindowsNanoServer))]
+ [InlineData(true)]
+ [InlineData(false)]
+ [PlatformSpecific(TestPlatforms.Windows)]
+ public async Task DefaultHandler_DefaultCredentials_Success(bool useNtlm)
+ {
+ await LoopbackServer.CreateClientAndServerAsync(
+ async uri =>
+ {
+ HttpRequestMessage requestMessage = new HttpRequestMessage(HttpMethod.Get, uri);
+ requestMessage.Version = new Version(1, 1);
+
+ var handler = new HttpClientHandler() { UseDefaultCredentials = true };
+ using (var client = new HttpClient(handler))
+ {
+ HttpResponseMessage response = await client.SendAsync(requestMessage);
+ Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+ _output.WriteLine($"Authenticated as {response.Headers.GetValues(NtAuthTests.UserHeaderName).First()}");
+ Assert.Equal("foo", await response.Content.ReadAsStringAsync());
+ }
+ },
+ async server =>
+ {
+ await server.AcceptConnectionAsync(async connection =>
+ {
+ Task t = useNtlm ? HandleNtlmAuthenticationRequest(connection) : HandleNegotiateAuthenticationRequest(connection);
+ await t;
+ }).ConfigureAwait(false);
+ });
+ }
+ }
+}
diff --git a/src/libraries/System.Net.Http/tests/FunctionalTests/NtAuthTests.cs b/src/libraries/System.Net.Http/tests/FunctionalTests/NtAuthTests.cs
index 096c5af0b42651..5c5954fb3491d2 100644
--- a/src/libraries/System.Net.Http/tests/FunctionalTests/NtAuthTests.cs
+++ b/src/libraries/System.Net.Http/tests/FunctionalTests/NtAuthTests.cs
@@ -104,7 +104,7 @@ public void Dispose()
}
}
- public class NtAuthTests : IClassFixture
+ public partial class NtAuthTests : IClassFixture
{
private readonly NtAuthServers _servers;
private readonly ITestOutputHelper _output;
diff --git a/src/libraries/System.Net.Http/tests/FunctionalTests/SocketsHttpHandlerTest.Http2FlowControl.cs b/src/libraries/System.Net.Http/tests/FunctionalTests/SocketsHttpHandlerTest.Http2FlowControl.cs
index 84ea142f933af6..f28491882ac3db 100644
--- a/src/libraries/System.Net.Http/tests/FunctionalTests/SocketsHttpHandlerTest.Http2FlowControl.cs
+++ b/src/libraries/System.Net.Http/tests/FunctionalTests/SocketsHttpHandlerTest.Http2FlowControl.cs
@@ -51,8 +51,10 @@ public async Task InitialHttp2StreamWindowSize_SentInSettingsFrame()
Assert.Equal(WindowSize, (int)entry.Value);
}
- [Fact]
- public Task InvalidRttPingResponse_RequestShouldFail()
+ [Theory]
+ [InlineData(0)] // Invalid PING payload
+ [InlineData(1)] // Unexpected PING response
+ public Task BadRttPingResponse_RequestShouldFail(int mode)
{
return Http2LoopbackServer.CreateClientAndServerAsync(async uri =>
{
@@ -67,13 +69,24 @@ public Task InvalidRttPingResponse_RequestShouldFail()
(int streamId, _) = await connection.ReadAndParseRequestHeaderAsync();
await connection.SendDefaultResponseHeadersAsync(streamId);
PingFrame pingFrame = await connection.ReadPingAsync(); // expect an RTT PING
- await connection.SendPingAckAsync(-6666); // send an invalid PING response
+
+ if (mode == 0)
+ {
+ // Invalid PING payload
+ await connection.SendPingAckAsync(-6666); // send an invalid PING response
+ }
+ else
+ {
+ // Unexpected PING response
+ await connection.SendPingAckAsync(pingFrame.Data); // send an valid PING response
+ await connection.SendPingAckAsync(pingFrame.Data - 1); // send a second unexpected PING response
+ }
+
await connection.SendResponseDataAsync(streamId, new byte[] { 1, 2, 3 }, true); // otherwise fine response
},
NoAutoPingResponseHttp2Options);
}
-
[OuterLoop("Runs long")]
[Fact]
public async Task HighBandwidthDelayProduct_ClientStreamReceiveWindowWindowScalesUp()
diff --git a/src/libraries/System.Net.Http/tests/FunctionalTests/SocketsHttpHandlerTest.cs b/src/libraries/System.Net.Http/tests/FunctionalTests/SocketsHttpHandlerTest.cs
index 14f444b1935a60..bfd1e83bfad502 100644
--- a/src/libraries/System.Net.Http/tests/FunctionalTests/SocketsHttpHandlerTest.cs
+++ b/src/libraries/System.Net.Http/tests/FunctionalTests/SocketsHttpHandlerTest.cs
@@ -837,8 +837,10 @@ public async Task Http2GetAsync_NoTrailingHeaders_EmptyCollection()
}
}
- [ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.SupportsAlpn))]
- public async Task Http2GetAsync_MissingTrailer_TrailingHeadersAccepted()
+ [InlineData(false)]
+ [InlineData(true)]
+ [ConditionalTheory(typeof(PlatformDetection), nameof(PlatformDetection.SupportsAlpn))]
+ public async Task Http2GetAsync_MissingTrailer_TrailingHeadersAccepted(bool responseHasContentLength)
{
using (Http2LoopbackServer server = Http2LoopbackServer.CreateServer())
using (HttpClient client = CreateHttpClient())
@@ -850,7 +852,14 @@ public async Task Http2GetAsync_MissingTrailer_TrailingHeadersAccepted()
int streamId = await connection.ReadRequestHeaderAsync();
// Response header.
- await connection.SendDefaultResponseHeadersAsync(streamId);
+ if (responseHasContentLength)
+ {
+ await connection.SendResponseHeadersAsync(streamId, endStream: false, headers: new[] { new HttpHeaderData("Content-Length", DataBytes.Length.ToString()) });
+ }
+ else
+ {
+ await connection.SendDefaultResponseHeadersAsync(streamId);
+ }
// Response data, missing Trailers.
await connection.WriteFrameAsync(MakeDataFrame(streamId, DataBytes));
@@ -888,8 +897,10 @@ public async Task Http2GetAsync_TrailerHeaders_TrailingPseudoHeadersThrow()
}
}
- [ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.SupportsAlpn))]
- public async Task Http2GetAsyncResponseHeadersReadOption_TrailingHeaders_Available()
+ [InlineData(false)]
+ [InlineData(true)]
+ [ConditionalTheory(typeof(PlatformDetection), nameof(PlatformDetection.SupportsAlpn))]
+ public async Task Http2GetAsyncResponseHeadersReadOption_TrailingHeaders_Available(bool responseHasContentLength)
{
using (Http2LoopbackServer server = Http2LoopbackServer.CreateServer())
using (HttpClient client = CreateHttpClient())
@@ -901,7 +912,14 @@ public async Task Http2GetAsyncResponseHeadersReadOption_TrailingHeaders_Availab
int streamId = await connection.ReadRequestHeaderAsync();
// Response header.
- await connection.SendDefaultResponseHeadersAsync(streamId);
+ if (responseHasContentLength)
+ {
+ await connection.SendResponseHeadersAsync(streamId, endStream: false, headers: new[] { new HttpHeaderData("Content-Length", DataBytes.Length.ToString()) });
+ }
+ else
+ {
+ await connection.SendDefaultResponseHeadersAsync(streamId);
+ }
// Response data, missing Trailers.
await connection.WriteFrameAsync(MakeDataFrame(streamId, DataBytes));
diff --git a/src/libraries/System.Net.Http/tests/FunctionalTests/System.Net.Http.Functional.Tests.csproj b/src/libraries/System.Net.Http/tests/FunctionalTests/System.Net.Http.Functional.Tests.csproj
index 5c177598057214..718551f9b65d55 100644
--- a/src/libraries/System.Net.Http/tests/FunctionalTests/System.Net.Http.Functional.Tests.csproj
+++ b/src/libraries/System.Net.Http/tests/FunctionalTests/System.Net.Http.Functional.Tests.csproj
@@ -1,4 +1,4 @@
-
+
../../src/Resources/Strings.resx
$(DefineConstants);TargetsWindows
@@ -33,8 +33,8 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/libraries/System.Net.Http/tests/StressTests/HttpStress/ClientOperations.cs b/src/libraries/System.Net.Http/tests/StressTests/HttpStress/ClientOperations.cs
index f856652adb71fb..0f8a249a7665d7 100644
--- a/src/libraries/System.Net.Http/tests/StressTests/HttpStress/ClientOperations.cs
+++ b/src/libraries/System.Net.Http/tests/StressTests/HttpStress/ClientOperations.cs
@@ -508,12 +508,6 @@ public static (string name, Func operation)[] Operations =
private static void ValidateStatusCode(HttpResponseMessage m, HttpStatusCode expectedStatus = HttpStatusCode.OK)
{
- // [ActiveIssue("https://github.com/dotnet/runtime/issues/55261")]
- if (m.StatusCode == HttpStatusCode.InternalServerError)
- {
- throw new Exception("IGNORE");
- }
-
if (m.StatusCode != expectedStatus)
{
throw new Exception($"Expected status code {expectedStatus}, got {m.StatusCode}");
diff --git a/src/libraries/System.Net.Http/tests/StressTests/HttpStress/Dockerfile b/src/libraries/System.Net.Http/tests/StressTests/HttpStress/Dockerfile
index 28c10ddfa8a086..02378956718778 100644
--- a/src/libraries/System.Net.Http/tests/StressTests/HttpStress/Dockerfile
+++ b/src/libraries/System.Net.Http/tests/StressTests/HttpStress/Dockerfile
@@ -10,9 +10,9 @@ COPY . .
# Pulling the msquic Debian package from msquic-ci public pipeline and from a hardcoded build.
# Note that this is a temporary solution until we have properly published Linux packages.
# Also note that in order to update to a newer msquic build, you have update this link.
-ARG MSQUIC_PACKAGE=libmsquic_1.6.0_amd64.deb
-ARG PACKAGES_DIR=LinuxPackages
-RUN wget 'https://dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_apis/build/builds/1266893/artifacts?artifactName=LinuxPackages&api-version=6.0&%24format=zip' -O "$PACKAGES_DIR".zip
+ARG MSQUIC_PACKAGE=libmsquic_1.9.0_amd64.deb
+ARG PACKAGES_DIR=UnsignedUnixPackages
+RUN wget 'https://dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_apis/build/builds/1426627/artifacts?artifactName=UnsignedUnixPackages&api-version=6.0&%24format=zip' -O "$PACKAGES_DIR".zip
RUN apt-get update
RUN apt-get install unzip
RUN unzip $PACKAGES_DIR.zip
diff --git a/src/libraries/System.Net.Http/tests/StressTests/HttpStress/HttpStress.csproj b/src/libraries/System.Net.Http/tests/StressTests/HttpStress/HttpStress.csproj
index 80b4aa21b108ba..770f3370a79ad4 100644
--- a/src/libraries/System.Net.Http/tests/StressTests/HttpStress/HttpStress.csproj
+++ b/src/libraries/System.Net.Http/tests/StressTests/HttpStress/HttpStress.csproj
@@ -5,6 +5,7 @@
net6.0
preview
enable
+ True
@@ -20,4 +21,4 @@
-
\ No newline at end of file
+
diff --git a/src/libraries/System.Net.Http/tests/StressTests/HttpStress/StressClient.cs b/src/libraries/System.Net.Http/tests/StressTests/HttpStress/StressClient.cs
index be0dd1c42b0636..fe0a13360fd410 100644
--- a/src/libraries/System.Net.Http/tests/StressTests/HttpStress/StressClient.cs
+++ b/src/libraries/System.Net.Http/tests/StressTests/HttpStress/StressClient.cs
@@ -209,11 +209,6 @@ async Task RunWorker(int taskNum)
{
_aggregator.RecordCancellation(opIndex, stopwatch.Elapsed);
}
- catch (Exception e) when (e.Message == "IGNORE")
- {
- // [ActiveIssue("https://github.com/dotnet/runtime/issues/55261")]
- // See ClientOperations.ValidateStatusCode
- }
catch (Exception e)
{
_aggregator.RecordFailure(e, opIndex, stopwatch.Elapsed, requestContext.IsCancellationRequested, taskNum: taskNum, iteration: i);
diff --git a/src/libraries/System.Net.Http/tests/UnitTests/Headers/HttpHeadersTest.cs b/src/libraries/System.Net.Http/tests/UnitTests/Headers/HttpHeadersTest.cs
index f56f85ac5bd0d4..139422163a95bc 100644
--- a/src/libraries/System.Net.Http/tests/UnitTests/Headers/HttpHeadersTest.cs
+++ b/src/libraries/System.Net.Http/tests/UnitTests/Headers/HttpHeadersTest.cs
@@ -2112,6 +2112,44 @@ public void AddHeaders_SourceHasInvalidHeaderValues_InvalidHeadersRemovedFromSou
Assert.False(destination.Contains("custom"), "destination contains 'custom' header.");
}
+ [Fact]
+ public void AddHeaders_ResponseHeaderToRequestHeaders_Success()
+ {
+ const string Name = "WWW-Authenticate";
+ const string Value = "Basic realm=\"Access to the staging site\", charset=\"UTF-8\"";
+
+ var request = new HttpRequestMessage();
+ Assert.True(request.Headers.TryAddWithoutValidation(Name, Value));
+
+ Assert.True(request.Headers.Contains(Name));
+ Assert.True(request.Headers.NonValidated.Contains(Name));
+
+ Assert.True(request.Headers.TryGetValues(Name, out IEnumerable values));
+ Assert.Equal(Value, values.Single());
+
+ Assert.True(request.Headers.NonValidated.TryGetValues(Name, out HeaderStringValues nvValues));
+ Assert.Equal(Value, nvValues.Single());
+ }
+
+ [Fact]
+ public void AddHeaders_RequestHeaderToResponseHeaders_Success()
+ {
+ const string Name = "Referer";
+ const string Value = "https://dot.net";
+
+ var response = new HttpResponseMessage();
+ Assert.True(response.Headers.TryAddWithoutValidation(Name, Value));
+
+ Assert.True(response.Headers.Contains(Name));
+ Assert.True(response.Headers.NonValidated.Contains(Name));
+
+ Assert.True(response.Headers.TryGetValues(Name, out IEnumerable values));
+ Assert.Equal(Value, values.Single());
+
+ Assert.True(response.Headers.NonValidated.TryGetValues(Name, out HeaderStringValues nvValues));
+ Assert.Equal(Value, nvValues.Single());
+ }
+
[Fact]
public void HeaderStringValues_Default_Empty()
{
diff --git a/src/libraries/System.Net.Http/tests/UnitTests/Headers/ObjectCollectionTest.cs b/src/libraries/System.Net.Http/tests/UnitTests/Headers/ObjectCollectionTest.cs
index d8ffd2c4ee1c75..3a8f69d9a44386 100644
--- a/src/libraries/System.Net.Http/tests/UnitTests/Headers/ObjectCollectionTest.cs
+++ b/src/libraries/System.Net.Http/tests/UnitTests/Headers/ObjectCollectionTest.cs
@@ -36,9 +36,74 @@ public void Ctor_ExecuteBothOverloads_MatchExpectation()
c.Add("value1");
Assert.Throws(() => { c.Add(null); });
+ }
+
+ [Fact]
+ public void ContainsAndRemove_UsesEqualitySemantics()
+ {
+ ObjectCollection c = new ObjectCollection();
+ string val1 = "value1";
+ string val1DifferentReference = "value" + 1;
+ Assert.NotSame(val1, val1DifferentReference);
+ Assert.Equal(val1, val1DifferentReference);
+
+ string val2 = "value2";
+ string val2DifferentReference = "value" + 2;
+ Assert.NotSame(val2, val2DifferentReference);
+ Assert.Equal(val2, val2DifferentReference);
+
+ string val3 = "value3";
+
+ // Start empty
+ Assert.Equal(0, c.Count);
+ Assert.False(c.Contains(val1));
+
+ // Single item
+ c.Add(val1);
Assert.Equal(1, c.Count);
- Assert.True(c.Contains("value1"));
+ Assert.True(c.Contains(val1));
+ Assert.True(c.Contains(val1DifferentReference));
+ Assert.False(c.Contains(val2));
+
+ // Single item removal
+ Assert.True(c.Remove(val1));
+ Assert.Equal(0, c.Count);
+ Assert.False(c.Contains(val1));
+
+ // Multi-value
+ c.Add(val1);
+ c.Add(val2);
+ Assert.Equal(2, c.Count);
+ Assert.True(c.Contains(val1));
+ Assert.True(c.Contains(val1DifferentReference));
+ Assert.True(c.Contains(val2));
+ Assert.True(c.Contains(val1DifferentReference));
+ Assert.False(c.Contains(val3));
+
+ // Removal when multiple exist, using different reference.
+ Assert.True(c.Remove(val1));
+ Assert.False(c.Contains(val1));
+ Assert.True(c.Contains(val2));
+ Assert.Equal(1, c.Count);
+
+ // Removal of non-existent
+ Assert.False(c.Remove(val3));
+ Assert.False(c.Remove(val1DifferentReference));
+ Assert.Equal(1, c.Count);
+ Assert.True(c.Contains(val2DifferentReference));
+
+ // Removal last item
+ Assert.True(c.Remove(val2DifferentReference));
+ Assert.Equal(0, c.Count);
+ Assert.False(c.Contains(val2));
+ Assert.False(c.Contains(val1));
+
+ // Remove from empty
+ Assert.False(c.Remove(val1));
+ Assert.False(c.Remove(val2));
+ Assert.False(c.Remove(val3));
+ Assert.Equal(0, c.Count);
}
}
}
diff --git a/src/libraries/System.Net.NetworkInformation/ref/System.Net.NetworkInformation.cs b/src/libraries/System.Net.NetworkInformation/ref/System.Net.NetworkInformation.cs
index b8d331ba9918cd..66ab317a7d93de 100644
--- a/src/libraries/System.Net.NetworkInformation/ref/System.Net.NetworkInformation.cs
+++ b/src/libraries/System.Net.NetworkInformation/ref/System.Net.NetworkInformation.cs
@@ -123,9 +123,11 @@ public virtual void CopyTo(System.Net.NetworkInformation.IPAddressInformation[]
public abstract partial class IPGlobalProperties
{
protected IPGlobalProperties() { }
+ [System.Runtime.Versioning.UnsupportedOSPlatform("android")]
public abstract string DhcpScopeName { get; }
public abstract string DomainName { get; }
public abstract string HostName { get; }
+ [System.Runtime.Versioning.UnsupportedOSPlatform("android")]
public abstract bool IsWinsProxy { get; }
public abstract System.Net.NetworkInformation.NetBiosNodeType NodeType { get; }
public virtual System.IAsyncResult BeginGetUnicastAddresses(System.AsyncCallback? callback, object? state) { throw null; }
@@ -136,16 +138,22 @@ protected IPGlobalProperties() { }
public abstract System.Net.IPEndPoint[] GetActiveTcpListeners();
[System.Runtime.Versioning.UnsupportedOSPlatform("android")]
public abstract System.Net.IPEndPoint[] GetActiveUdpListeners();
+ [System.Runtime.Versioning.UnsupportedOSPlatform("android")]
public abstract System.Net.NetworkInformation.IcmpV4Statistics GetIcmpV4Statistics();
+ [System.Runtime.Versioning.UnsupportedOSPlatform("android")]
public abstract System.Net.NetworkInformation.IcmpV6Statistics GetIcmpV6Statistics();
[System.Runtime.Versioning.UnsupportedOSPlatform("illumos")]
[System.Runtime.Versioning.UnsupportedOSPlatform("solaris")]
public static System.Net.NetworkInformation.IPGlobalProperties GetIPGlobalProperties() { throw null; }
public abstract System.Net.NetworkInformation.IPGlobalStatistics GetIPv4GlobalStatistics();
public abstract System.Net.NetworkInformation.IPGlobalStatistics GetIPv6GlobalStatistics();
+ [System.Runtime.Versioning.UnsupportedOSPlatform("android")]
public abstract System.Net.NetworkInformation.TcpStatistics GetTcpIPv4Statistics();
+ [System.Runtime.Versioning.UnsupportedOSPlatform("android")]
public abstract System.Net.NetworkInformation.TcpStatistics GetTcpIPv6Statistics();
+ [System.Runtime.Versioning.UnsupportedOSPlatform("android")]
public abstract System.Net.NetworkInformation.UdpStatistics GetUdpIPv4Statistics();
+ [System.Runtime.Versioning.UnsupportedOSPlatform("android")]
public abstract System.Net.NetworkInformation.UdpStatistics GetUdpIPv6Statistics();
public virtual System.Net.NetworkInformation.UnicastIPAddressInformationCollection GetUnicastAddresses() { throw null; }
public virtual System.Threading.Tasks.Task GetUnicastAddressesAsync() { throw null; }
@@ -153,41 +161,69 @@ protected IPGlobalProperties() { }
public abstract partial class IPGlobalStatistics
{
protected IPGlobalStatistics() { }
+ [System.Runtime.Versioning.UnsupportedOSPlatform("android")]
public abstract int DefaultTtl { get; }
+ [System.Runtime.Versioning.UnsupportedOSPlatform("android")]
public abstract bool ForwardingEnabled { get; }
public abstract int NumberOfInterfaces { get; }
public abstract int NumberOfIPAddresses { get; }
+ [System.Runtime.Versioning.UnsupportedOSPlatform("android")]
public abstract int NumberOfRoutes { get; }
+ [System.Runtime.Versioning.UnsupportedOSPlatform("android")]
public abstract long OutputPacketRequests { get; }
+ [System.Runtime.Versioning.UnsupportedOSPlatform("android")]
public abstract long OutputPacketRoutingDiscards { get; }
+ [System.Runtime.Versioning.UnsupportedOSPlatform("android")]
public abstract long OutputPacketsDiscarded { get; }
+ [System.Runtime.Versioning.UnsupportedOSPlatform("android")]
public abstract long OutputPacketsWithNoRoute { get; }
+ [System.Runtime.Versioning.UnsupportedOSPlatform("android")]
public abstract long PacketFragmentFailures { get; }
+ [System.Runtime.Versioning.UnsupportedOSPlatform("android")]
public abstract long PacketReassembliesRequired { get; }
+ [System.Runtime.Versioning.UnsupportedOSPlatform("android")]
public abstract long PacketReassemblyFailures { get; }
+ [System.Runtime.Versioning.UnsupportedOSPlatform("android")]
public abstract long PacketReassemblyTimeout { get; }
+ [System.Runtime.Versioning.UnsupportedOSPlatform("android")]
public abstract long PacketsFragmented { get; }
+ [System.Runtime.Versioning.UnsupportedOSPlatform("android")]
public abstract long PacketsReassembled { get; }
+ [System.Runtime.Versioning.UnsupportedOSPlatform("android")]
public abstract long ReceivedPackets { get; }
+ [System.Runtime.Versioning.UnsupportedOSPlatform("android")]
public abstract long ReceivedPacketsDelivered { get; }
+ [System.Runtime.Versioning.UnsupportedOSPlatform("android")]
public abstract long ReceivedPacketsDiscarded { get; }
+ [System.Runtime.Versioning.UnsupportedOSPlatform("android")]
public abstract long ReceivedPacketsForwarded { get; }
+ [System.Runtime.Versioning.UnsupportedOSPlatform("android")]
public abstract long ReceivedPacketsWithAddressErrors { get; }
+ [System.Runtime.Versioning.UnsupportedOSPlatform("android")]
public abstract long ReceivedPacketsWithHeadersErrors { get; }
+ [System.Runtime.Versioning.UnsupportedOSPlatform("android")]
public abstract long ReceivedPacketsWithUnknownProtocol { get; }
}
public abstract partial class IPInterfaceProperties
{
protected IPInterfaceProperties() { }
+ [System.Runtime.Versioning.UnsupportedOSPlatform("android")]
public abstract System.Net.NetworkInformation.IPAddressInformationCollection AnycastAddresses { get; }
+ [System.Runtime.Versioning.UnsupportedOSPlatform("android")]
public abstract System.Net.NetworkInformation.IPAddressCollection DhcpServerAddresses { get; }
+ [System.Runtime.Versioning.UnsupportedOSPlatform("android")]
public abstract System.Net.NetworkInformation.IPAddressCollection DnsAddresses { get; }
+ [System.Runtime.Versioning.UnsupportedOSPlatform("android")]
public abstract string DnsSuffix { get; }
+ [System.Runtime.Versioning.UnsupportedOSPlatform("android")]
public abstract System.Net.NetworkInformation.GatewayIPAddressInformationCollection GatewayAddresses { get; }
+ [System.Runtime.Versioning.UnsupportedOSPlatform("android")]
public abstract bool IsDnsEnabled { get; }
+ [System.Runtime.Versioning.UnsupportedOSPlatform("android")]
public abstract bool IsDynamicDnsEnabled { get; }
public abstract System.Net.NetworkInformation.MulticastIPAddressInformationCollection MulticastAddresses { get; }
public abstract System.Net.NetworkInformation.UnicastIPAddressInformationCollection UnicastAddresses { get; }
+ [System.Runtime.Versioning.UnsupportedOSPlatform("android")]
public abstract System.Net.NetworkInformation.IPAddressCollection WinsServersAddresses { get; }
public abstract System.Net.NetworkInformation.IPv4InterfaceProperties GetIPv4Properties();
public abstract System.Net.NetworkInformation.IPv6InterfaceProperties GetIPv6Properties();
@@ -212,11 +248,16 @@ public abstract partial class IPv4InterfaceProperties
{
protected IPv4InterfaceProperties() { }
public abstract int Index { get; }
+ [System.Runtime.Versioning.UnsupportedOSPlatform("android")]
public abstract bool IsAutomaticPrivateAddressingActive { get; }
+ [System.Runtime.Versioning.UnsupportedOSPlatform("android")]
public abstract bool IsAutomaticPrivateAddressingEnabled { get; }
+ [System.Runtime.Versioning.UnsupportedOSPlatform("android")]
public abstract bool IsDhcpEnabled { get; }
+ [System.Runtime.Versioning.UnsupportedOSPlatform("android")]
public abstract bool IsForwardingEnabled { get; }
public abstract int Mtu { get; }
+ [System.Runtime.Versioning.UnsupportedOSPlatform("android")]
public abstract bool UsesWins { get; }
}
public abstract partial class IPv4InterfaceStatistics
@@ -316,7 +357,9 @@ protected NetworkInterface() { }
[System.Runtime.Versioning.UnsupportedOSPlatform("solaris")]
public static System.Net.NetworkInformation.NetworkInterface[] GetAllNetworkInterfaces() { throw null; }
public virtual System.Net.NetworkInformation.IPInterfaceProperties GetIPProperties() { throw null; }
+ [System.Runtime.Versioning.UnsupportedOSPlatform("android")]
public virtual System.Net.NetworkInformation.IPInterfaceStatistics GetIPStatistics() { throw null; }
+ [System.Runtime.Versioning.UnsupportedOSPlatform("android")]
public virtual System.Net.NetworkInformation.IPv4InterfaceStatistics GetIPv4Statistics() { throw null; }
[System.Runtime.Versioning.UnsupportedOSPlatform("illumos")]
[System.Runtime.Versioning.UnsupportedOSPlatform("solaris")]
diff --git a/src/libraries/System.Net.NetworkInformation/src/System.Net.NetworkInformation.csproj b/src/libraries/System.Net.NetworkInformation/src/System.Net.NetworkInformation.csproj
index dc251f9c75dc41..b1c5a10f45a648 100644
--- a/src/libraries/System.Net.NetworkInformation/src/System.Net.NetworkInformation.csproj
+++ b/src/libraries/System.Net.NetworkInformation/src/System.Net.NetworkInformation.csproj
@@ -1,7 +1,7 @@
true
- $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Linux;$(NetCoreAppCurrent)-OSX;$(NetCoreAppCurrent)-iOS;$(NetCoreAppCurrent)-tvOS;$(NetCoreAppCurrent)-FreeBSD;$(NetCoreAppCurrent)-illumos;$(NetCoreAppCurrent)-Solaris;$(NetCoreAppCurrent)
+ $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Linux;$(NetCoreAppCurrent)-Android;$(NetCoreAppCurrent)-OSX;$(NetCoreAppCurrent)-iOS;$(NetCoreAppCurrent)-tvOS;$(NetCoreAppCurrent)-FreeBSD;$(NetCoreAppCurrent)-illumos;$(NetCoreAppCurrent)-Solaris;$(NetCoreAppCurrent)
enable
@@ -118,8 +118,8 @@
-
-
+
+
@@ -144,6 +144,17 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/libraries/System.Net.NetworkInformation/src/System/Net/NetworkInformation/AndroidIPGlobalProperties.cs b/src/libraries/System.Net.NetworkInformation/src/System/Net/NetworkInformation/AndroidIPGlobalProperties.cs
new file mode 100644
index 00000000000000..4cebb2c55efa9a
--- /dev/null
+++ b/src/libraries/System.Net.NetworkInformation/src/System/Net/NetworkInformation/AndroidIPGlobalProperties.cs
@@ -0,0 +1,32 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+namespace System.Net.NetworkInformation
+{
+ internal sealed class AndroidIPGlobalProperties : UnixIPGlobalProperties
+ {
+ public override TcpConnectionInformation[] GetActiveTcpConnections() => throw new PlatformNotSupportedException();
+
+ public override IPEndPoint[] GetActiveTcpListeners() => throw new PlatformNotSupportedException();
+
+ public override IPEndPoint[] GetActiveUdpListeners() => throw new PlatformNotSupportedException();
+
+ public override IcmpV4Statistics GetIcmpV4Statistics() => throw new PlatformNotSupportedException();
+
+ public override IcmpV6Statistics GetIcmpV6Statistics() => throw new PlatformNotSupportedException();
+
+ public override IPGlobalStatistics GetIPv4GlobalStatistics()
+ => new AndroidIPGlobalStatistics(ipv4: true);
+
+ public override IPGlobalStatistics GetIPv6GlobalStatistics()
+ => new AndroidIPGlobalStatistics(ipv4: false);
+
+ public override TcpStatistics GetTcpIPv4Statistics() => throw new PlatformNotSupportedException();
+
+ public override TcpStatistics GetTcpIPv6Statistics() => throw new PlatformNotSupportedException();
+
+ public override UdpStatistics GetUdpIPv4Statistics() => throw new PlatformNotSupportedException();
+
+ public override UdpStatistics GetUdpIPv6Statistics() => throw new PlatformNotSupportedException();
+ }
+}
diff --git a/src/libraries/System.Net.NetworkInformation/src/System/Net/NetworkInformation/AndroidIPGlobalStatistics.cs b/src/libraries/System.Net.NetworkInformation/src/System/Net/NetworkInformation/AndroidIPGlobalStatistics.cs
new file mode 100644
index 00000000000000..de57e068a1ddbf
--- /dev/null
+++ b/src/libraries/System.Net.NetworkInformation/src/System/Net/NetworkInformation/AndroidIPGlobalStatistics.cs
@@ -0,0 +1,73 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Diagnostics;
+using System.IO;
+using System.Runtime.InteropServices;
+using System.Runtime.Versioning;
+using System.Net.Sockets;
+
+namespace System.Net.NetworkInformation
+{
+ internal sealed class AndroidIPGlobalStatistics : IPGlobalStatistics
+ {
+ public AndroidIPGlobalStatistics(bool ipv4)
+ {
+ AndroidNetworkInterface[] networkInterfaces = NetworkInterfacePal.GetAndroidNetworkInterfaces();
+
+ foreach (var networkInterface in networkInterfaces)
+ {
+ var component = ipv4 ? NetworkInterfaceComponent.IPv4 : NetworkInterfaceComponent.IPv6;
+ if (networkInterface.Supports(component))
+ {
+ NumberOfInterfaces++;
+ }
+
+ foreach (UnixUnicastIPAddressInformation addressInformation in networkInterface.UnicastAddress)
+ {
+ bool isIPv4 = addressInformation.Address.AddressFamily == AddressFamily.InterNetwork;
+ if (isIPv4 == ipv4)
+ {
+ NumberOfIPAddresses++;
+ }
+ }
+
+ if (networkInterface.MulticastAddresess != null)
+ {
+ foreach (IPAddress address in networkInterface.MulticastAddresess)
+ {
+ bool isIPv4 = address.AddressFamily == AddressFamily.InterNetwork;
+ if (isIPv4 == ipv4)
+ {
+ NumberOfIPAddresses++;
+ }
+ }
+ }
+ }
+ }
+
+ public override int NumberOfInterfaces { get; }
+ public override int NumberOfIPAddresses { get; }
+
+ public override int DefaultTtl => throw new PlatformNotSupportedException(SR.net_InformationUnavailableOnPlatform);
+ public override bool ForwardingEnabled => throw new PlatformNotSupportedException(SR.net_InformationUnavailableOnPlatform);
+ public override int NumberOfRoutes => throw new PlatformNotSupportedException(SR.net_InformationUnavailableOnPlatform);
+ public override long OutputPacketRequests => throw new PlatformNotSupportedException(SR.net_InformationUnavailableOnPlatform);
+ public override long OutputPacketRoutingDiscards => throw new PlatformNotSupportedException(SR.net_InformationUnavailableOnPlatform);
+ public override long OutputPacketsDiscarded => throw new PlatformNotSupportedException(SR.net_InformationUnavailableOnPlatform);
+ public override long OutputPacketsWithNoRoute => throw new PlatformNotSupportedException(SR.net_InformationUnavailableOnPlatform);
+ public override long PacketFragmentFailures => throw new PlatformNotSupportedException(SR.net_InformationUnavailableOnPlatform);
+ public override long PacketReassembliesRequired => throw new PlatformNotSupportedException(SR.net_InformationUnavailableOnPlatform);
+ public override long PacketReassemblyFailures => throw new PlatformNotSupportedException(SR.net_InformationUnavailableOnPlatform);
+ public override long PacketReassemblyTimeout => throw new PlatformNotSupportedException(SR.net_InformationUnavailableOnPlatform);
+ public override long PacketsFragmented => throw new PlatformNotSupportedException(SR.net_InformationUnavailableOnPlatform);
+ public override long PacketsReassembled => throw new PlatformNotSupportedException(SR.net_InformationUnavailableOnPlatform);
+ public override long ReceivedPackets => throw new PlatformNotSupportedException(SR.net_InformationUnavailableOnPlatform);
+ public override long ReceivedPacketsDelivered => throw new PlatformNotSupportedException(SR.net_InformationUnavailableOnPlatform);
+ public override long ReceivedPacketsDiscarded => throw new PlatformNotSupportedException(SR.net_InformationUnavailableOnPlatform);
+ public override long ReceivedPacketsForwarded => throw new PlatformNotSupportedException(SR.net_InformationUnavailableOnPlatform);
+ public override long ReceivedPacketsWithAddressErrors => throw new PlatformNotSupportedException(SR.net_InformationUnavailableOnPlatform);
+ public override long ReceivedPacketsWithHeadersErrors => throw new PlatformNotSupportedException(SR.net_InformationUnavailableOnPlatform);
+ public override long ReceivedPacketsWithUnknownProtocol => throw new PlatformNotSupportedException(SR.net_InformationUnavailableOnPlatform);
+ }
+}
diff --git a/src/libraries/System.Net.NetworkInformation/src/System/Net/NetworkInformation/AndroidIPInterfaceProperties.cs b/src/libraries/System.Net.NetworkInformation/src/System/Net/NetworkInformation/AndroidIPInterfaceProperties.cs
new file mode 100644
index 00000000000000..cee58c47d84475
--- /dev/null
+++ b/src/libraries/System.Net.NetworkInformation/src/System/Net/NetworkInformation/AndroidIPInterfaceProperties.cs
@@ -0,0 +1,30 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Collections.Generic;
+using System.IO;
+
+namespace System.Net.NetworkInformation
+{
+ internal sealed class AndroidIPInterfaceProperties : UnixIPInterfaceProperties
+ {
+ private readonly AndroidIPv4InterfaceProperties _ipv4Properties;
+ private readonly AndroidIPv6InterfaceProperties _ipv6Properties;
+
+ public AndroidIPInterfaceProperties(AndroidNetworkInterface ani)
+ : base(ani, globalConfig: true)
+ {
+ _ipv4Properties = new AndroidIPv4InterfaceProperties(ani);
+ _ipv6Properties = new AndroidIPv6InterfaceProperties(ani);
+ }
+
+ public override IPv4InterfaceProperties GetIPv4Properties() => _ipv4Properties;
+ public override IPv6InterfaceProperties GetIPv6Properties() => _ipv6Properties;
+
+ public override bool IsDynamicDnsEnabled => throw new PlatformNotSupportedException(SR.net_InformationUnavailableOnPlatform);
+ public override IPAddressInformationCollection AnycastAddresses => throw new PlatformNotSupportedException(SR.net_InformationUnavailableOnPlatform);
+ public override GatewayIPAddressInformationCollection GatewayAddresses => throw new PlatformNotSupportedException(SR.net_InformationUnavailableOnPlatform);
+ public override IPAddressCollection DhcpServerAddresses => throw new PlatformNotSupportedException(SR.net_InformationUnavailableOnPlatform);
+ public override IPAddressCollection WinsServersAddresses => throw new PlatformNotSupportedException(SR.net_InformationUnavailableOnPlatform);
+ }
+}
diff --git a/src/libraries/System.Net.NetworkInformation/src/System/Net/NetworkInformation/AndroidIPv4InterfaceProperties.cs b/src/libraries/System.Net.NetworkInformation/src/System/Net/NetworkInformation/AndroidIPv4InterfaceProperties.cs
new file mode 100644
index 00000000000000..cc12cf7f357456
--- /dev/null
+++ b/src/libraries/System.Net.NetworkInformation/src/System/Net/NetworkInformation/AndroidIPv4InterfaceProperties.cs
@@ -0,0 +1,24 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.IO;
+
+namespace System.Net.NetworkInformation
+{
+ internal sealed class AndroidIPv4InterfaceProperties : UnixIPv4InterfaceProperties
+ {
+ public AndroidIPv4InterfaceProperties(AndroidNetworkInterface androidNetworkInterface)
+ : base(androidNetworkInterface)
+ {
+ Mtu = androidNetworkInterface._mtu;
+ }
+
+ public override int Mtu { get; }
+
+ public override bool IsAutomaticPrivateAddressingActive => throw new PlatformNotSupportedException(SR.net_InformationUnavailableOnPlatform);
+ public override bool IsAutomaticPrivateAddressingEnabled => throw new PlatformNotSupportedException(SR.net_InformationUnavailableOnPlatform);
+ public override bool IsDhcpEnabled => throw new PlatformNotSupportedException(SR.net_InformationUnavailableOnPlatform);
+ public override bool IsForwardingEnabled => throw new PlatformNotSupportedException(SR.net_InformationUnavailableOnPlatform);
+ public override bool UsesWins => throw new PlatformNotSupportedException(SR.net_InformationUnavailableOnPlatform);
+ }
+}
diff --git a/src/libraries/System.Net.NetworkInformation/src/System/Net/NetworkInformation/AndroidIPv6InterfaceProperties.cs b/src/libraries/System.Net.NetworkInformation/src/System/Net/NetworkInformation/AndroidIPv6InterfaceProperties.cs
new file mode 100644
index 00000000000000..9a5f872231efde
--- /dev/null
+++ b/src/libraries/System.Net.NetworkInformation/src/System/Net/NetworkInformation/AndroidIPv6InterfaceProperties.cs
@@ -0,0 +1,31 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.IO;
+
+namespace System.Net.NetworkInformation
+{
+ internal sealed class AndroidIPv6InterfaceProperties : UnixIPv6InterfaceProperties
+ {
+ private readonly AndroidNetworkInterface _androidNetworkInterface;
+
+ public AndroidIPv6InterfaceProperties(AndroidNetworkInterface androidNetworkInterface)
+ : base(androidNetworkInterface)
+ {
+ _androidNetworkInterface = androidNetworkInterface;
+ }
+
+ public override int Mtu => _androidNetworkInterface._mtu;
+
+ public override long GetScopeId(ScopeLevel scopeLevel)
+ {
+ if (scopeLevel == ScopeLevel.None || scopeLevel == ScopeLevel.Interface ||
+ scopeLevel == ScopeLevel.Link || scopeLevel == ScopeLevel.Subnet)
+ {
+ return _androidNetworkInterface.Index;
+ }
+
+ return 0;
+ }
+ }
+}
diff --git a/src/libraries/System.Net.NetworkInformation/src/System/Net/NetworkInformation/AndroidNetworkInterface.cs b/src/libraries/System.Net.NetworkInformation/src/System/Net/NetworkInformation/AndroidNetworkInterface.cs
new file mode 100644
index 00000000000000..dcf66895aea7b1
--- /dev/null
+++ b/src/libraries/System.Net.NetworkInformation/src/System/Net/NetworkInformation/AndroidNetworkInterface.cs
@@ -0,0 +1,54 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Net;
+
+namespace System.Net.NetworkInformation
+{
+ ///
+ /// Implements a NetworkInterface on Android.
+ ///
+ internal sealed class AndroidNetworkInterface : UnixNetworkInterface
+ {
+ internal readonly int _mtu;
+ private readonly AndroidIPInterfaceProperties _ipProperties;
+
+ internal unsafe AndroidNetworkInterface(string name, Interop.Sys.NetworkInterfaceInfo *networkInterfaceInfo)
+ : base(name)
+ {
+ _index = networkInterfaceInfo->InterfaceIndex;
+ if (networkInterfaceInfo->NumAddressBytes > 0)
+ {
+ _physicalAddress = new PhysicalAddress(new ReadOnlySpan(networkInterfaceInfo->AddressBytes, networkInterfaceInfo->NumAddressBytes).ToArray());
+ }
+
+ _mtu = networkInterfaceInfo->Mtu;
+ _ipProperties = new AndroidIPInterfaceProperties(this);
+
+ OperationalStatus = (OperationalStatus)networkInterfaceInfo->OperationalState;
+ Speed = networkInterfaceInfo->Speed;
+ SupportsMulticast = networkInterfaceInfo->SupportsMulticast != 0;
+ NetworkInterfaceType = (NetworkInterfaceType)networkInterfaceInfo->HardwareType;
+ }
+
+ internal unsafe void AddAddress(Interop.Sys.IpAddressInfo *addressInfo)
+ {
+ var address = new IPAddress(new ReadOnlySpan(addressInfo->AddressBytes, addressInfo->NumAddressBytes));
+ if (address.IsIPv6LinkLocal)
+ {
+ address.ScopeId = addressInfo->InterfaceIndex;
+ }
+
+ AddAddress(address, addressInfo->PrefixLength);
+ }
+
+ public override bool SupportsMulticast { get; }
+ public override IPInterfaceProperties GetIPProperties() => _ipProperties;
+ public override IPInterfaceStatistics GetIPStatistics() => throw new PlatformNotSupportedException(SR.net_InformationUnavailableOnPlatform);
+ public override IPv4InterfaceStatistics GetIPv4Statistics() => throw new PlatformNotSupportedException(SR.net_InformationUnavailableOnPlatform);
+ public override OperationalStatus OperationalStatus { get; }
+ public override NetworkInterfaceType NetworkInterfaceType { get; }
+ public override long Speed { get; }
+ public override bool IsReceiveOnly => false;
+ }
+}
diff --git a/src/libraries/System.Net.NetworkInformation/src/System/Net/NetworkInformation/IPGlobalProperties.cs b/src/libraries/System.Net.NetworkInformation/src/System/Net/NetworkInformation/IPGlobalProperties.cs
index d835ce2ecd65ba..1371a47d3ed945 100644
--- a/src/libraries/System.Net.NetworkInformation/src/System/Net/NetworkInformation/IPGlobalProperties.cs
+++ b/src/libraries/System.Net.NetworkInformation/src/System/Net/NetworkInformation/IPGlobalProperties.cs
@@ -40,6 +40,7 @@ public static IPGlobalProperties GetIPGlobalProperties()
///
/// Gets the Dynamic Host Configuration Protocol (DHCP) scope name.
///
+ [UnsupportedOSPlatform("android")]
public abstract string DhcpScopeName { get; }
///
@@ -55,6 +56,7 @@ public static IPGlobalProperties GetIPGlobalProperties()
///
/// Gets a bool value that specifies whether the local computer is acting as a Windows Internet Name Service (WINS) proxy.
///
+ [UnsupportedOSPlatform("android")]
public abstract bool IsWinsProxy { get; }
///
@@ -72,25 +74,31 @@ public virtual UnicastIPAddressInformationCollection EndGetUnicastAddresses(IAsy
throw NotImplemented.ByDesignWithMessage(SR.net_MethodNotImplementedException);
}
+ [UnsupportedOSPlatform("android")]
public abstract TcpStatistics GetTcpIPv4Statistics();
+ [UnsupportedOSPlatform("android")]
public abstract TcpStatistics GetTcpIPv6Statistics();
///
/// Provides User Datagram Protocol (UDP) statistical data for the local computer.
///
+ [UnsupportedOSPlatform("android")]
public abstract UdpStatistics GetUdpIPv4Statistics();
+ [UnsupportedOSPlatform("android")]
public abstract UdpStatistics GetUdpIPv6Statistics();
///
/// Provides Internet Control Message Protocol (ICMP) version 4 statistical data for the local computer.
///
+ [UnsupportedOSPlatform("android")]
public abstract IcmpV4Statistics GetIcmpV4Statistics();
///
/// Provides Internet Control Message Protocol (ICMP) version 6 statistical data for the local computer.
///
+ [UnsupportedOSPlatform("android")]
public abstract IcmpV6Statistics GetIcmpV6Statistics();
///
diff --git a/src/libraries/System.Net.NetworkInformation/src/System/Net/NetworkInformation/IPGlobalPropertiesPal.Android.cs b/src/libraries/System.Net.NetworkInformation/src/System/Net/NetworkInformation/IPGlobalPropertiesPal.Android.cs
new file mode 100644
index 00000000000000..33e09ece17c696
--- /dev/null
+++ b/src/libraries/System.Net.NetworkInformation/src/System/Net/NetworkInformation/IPGlobalPropertiesPal.Android.cs
@@ -0,0 +1,13 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+namespace System.Net.NetworkInformation
+{
+ internal static class IPGlobalPropertiesPal
+ {
+ public static IPGlobalProperties GetIPGlobalProperties()
+ {
+ return new AndroidIPGlobalProperties();
+ }
+ }
+}
diff --git a/src/libraries/System.Net.NetworkInformation/src/System/Net/NetworkInformation/IPGlobalStatistics.cs b/src/libraries/System.Net.NetworkInformation/src/System/Net/NetworkInformation/IPGlobalStatistics.cs
index a8103f867e83d4..04b9f14f1eab2b 100644
--- a/src/libraries/System.Net.NetworkInformation/src/System/Net/NetworkInformation/IPGlobalStatistics.cs
+++ b/src/libraries/System.Net.NetworkInformation/src/System/Net/NetworkInformation/IPGlobalStatistics.cs
@@ -1,6 +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.Runtime.Versioning;
+
namespace System.Net.NetworkInformation
{
///
@@ -11,11 +13,13 @@ public abstract class IPGlobalStatistics
///
/// Gets the default time-to-live (TTL) value for Internet Protocol (IP) packets.
///
+ [UnsupportedOSPlatform("android")]
public abstract int DefaultTtl { get; }
///
/// Gets a bool value that specifies whether Internet Protocol (IP) packet forwarding is enabled.
///
+ [UnsupportedOSPlatform("android")]
public abstract bool ForwardingEnabled { get; }
///
@@ -31,91 +35,109 @@ public abstract class IPGlobalStatistics
///
/// Gets the number of outbound Internet Protocol (IP) packets.
///
+ [UnsupportedOSPlatform("android")]
public abstract long OutputPacketRequests { get; }
///
/// Gets the number of routes in the routing table that have been discarded.
///
+ [UnsupportedOSPlatform("android")]
public abstract long OutputPacketRoutingDiscards { get; }
///
/// Gets the number of transmitted Internet Protocol (IP) packets that have been discarded.
///
+ [UnsupportedOSPlatform("android")]
public abstract long OutputPacketsDiscarded { get; }
///
/// Gets the number of Internet Protocol (IP) packets for which the local computer could not determine a route to the destination address.
///
+ [UnsupportedOSPlatform("android")]
public abstract long OutputPacketsWithNoRoute { get; }
///
/// Gets the number of Internet Protocol (IP) packets that could not be fragmented.
///
+ [UnsupportedOSPlatform("android")]
public abstract long PacketFragmentFailures { get; }
///
/// Gets the number of Internet Protocol (IP) packets that required reassembly.
///
+ [UnsupportedOSPlatform("android")]
public abstract long PacketReassembliesRequired { get; }
///
/// Gets the number of Internet Protocol (IP) packets that were not successfully reassembled.
///
+ [UnsupportedOSPlatform("android")]
public abstract long PacketReassemblyFailures { get; }
///
/// Gets the maximum amount of time within which all fragments of an Internet Protocol (IP) packet must arrive.
///
+ [UnsupportedOSPlatform("android")]
public abstract long PacketReassemblyTimeout { get; }
///
/// Gets the number of Internet Protocol (IP) packets fragmented.
///
+ [UnsupportedOSPlatform("android")]
public abstract long PacketsFragmented { get; }
///
/// Gets the number of Internet Protocol (IP) packets reassembled.
///
+ [UnsupportedOSPlatform("android")]
public abstract long PacketsReassembled { get; }
///
/// Gets the number of Internet Protocol (IP) packets received.
///
+ [UnsupportedOSPlatform("android")]
public abstract long ReceivedPackets { get; }
///
/// Gets the number of Internet Protocol(IP) packets received and delivered.
///
+ [UnsupportedOSPlatform("android")]
public abstract long ReceivedPacketsDelivered { get; }
///
/// Gets the number of Internet Protocol (IP) packets that have been received and discarded.
///
+ [UnsupportedOSPlatform("android")]
public abstract long ReceivedPacketsDiscarded { get; }
///
/// Gets the number of Internet Protocol (IP) packets forwarded.
///
+ [UnsupportedOSPlatform("android")]
public abstract long ReceivedPacketsForwarded { get; }
///
/// Gets the number of Internet Protocol (IP) packets with address errors that were received.
///
+ [UnsupportedOSPlatform("android")]
public abstract long ReceivedPacketsWithAddressErrors { get; }
///
/// Gets the number of Internet Protocol (IP) packets with header errors that were received.
///
+ [UnsupportedOSPlatform("android")]
public abstract long ReceivedPacketsWithHeadersErrors { get; }
///
/// Gets the number of Internet Protocol (IP) packets received on the local machine with an unknown protocol in the header.
///
+ [UnsupportedOSPlatform("android")]
public abstract long ReceivedPacketsWithUnknownProtocol { get; }
///
/// Gets the number of routes in the Internet Protocol (IP) routing table.
///
+ [UnsupportedOSPlatform("android")]
public abstract int NumberOfRoutes { get; }
}
}
diff --git a/src/libraries/System.Net.NetworkInformation/src/System/Net/NetworkInformation/IPInterfaceProperties.cs b/src/libraries/System.Net.NetworkInformation/src/System/Net/NetworkInformation/IPInterfaceProperties.cs
index e659598f5e4f4c..863737ce18f6d3 100644
--- a/src/libraries/System.Net.NetworkInformation/src/System/Net/NetworkInformation/IPInterfaceProperties.cs
+++ b/src/libraries/System.Net.NetworkInformation/src/System/Net/NetworkInformation/IPInterfaceProperties.cs
@@ -1,6 +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.Runtime.Versioning;
+
namespace System.Net.NetworkInformation
{
///
@@ -12,16 +14,19 @@ public abstract class IPInterfaceProperties
///
/// Gets a bool value that indicates whether this interface is configured to send name resolution queries to a Domain Name System (DNS) server.
///
+ [UnsupportedOSPlatform("android")]
public abstract bool IsDnsEnabled { get; }
///
/// Gets the Domain Name System (DNS) suffix associated with this interface.
///
+ [UnsupportedOSPlatform("android")]
public abstract string DnsSuffix { get; }
///
/// Gets a bool value that indicates whether this interface is configured to automatically register its IP address information with the Domain Name System (DNS).
///
+ [UnsupportedOSPlatform("android")]
public abstract bool IsDynamicDnsEnabled { get; }
///
@@ -37,26 +42,31 @@ public abstract class IPInterfaceProperties
///
/// The address identifies multiple computers. Packets sent to an anycast address are sent to one of the computers identified by the address.
///
+ [UnsupportedOSPlatform("android")]
public abstract IPAddressInformationCollection AnycastAddresses { get; }
///
/// The address is that of a Domain Name Service (DNS) server for the local computer.
///
+ [UnsupportedOSPlatform("android")]
public abstract IPAddressCollection DnsAddresses { get; }
///
/// Gets the network gateway addresses.
///
+ [UnsupportedOSPlatform("android")]
public abstract GatewayIPAddressInformationCollection GatewayAddresses { get; }
///
/// Gets the addresses for Dynamic Host Configuration Protocol (DHCP) servers.
///
+ [UnsupportedOSPlatform("android")]
public abstract IPAddressCollection DhcpServerAddresses { get; }
///
/// Gets the list of Wins Servers registered with this interface
///
+ [UnsupportedOSPlatform("android")]
public abstract IPAddressCollection WinsServersAddresses { get; }
///
diff --git a/src/libraries/System.Net.NetworkInformation/src/System/Net/NetworkInformation/IPv4InterfaceProperties.cs b/src/libraries/System.Net.NetworkInformation/src/System/Net/NetworkInformation/IPv4InterfaceProperties.cs
index 0f104e3fce8fc3..9f9d0b1e3766dd 100644
--- a/src/libraries/System.Net.NetworkInformation/src/System/Net/NetworkInformation/IPv4InterfaceProperties.cs
+++ b/src/libraries/System.Net.NetworkInformation/src/System/Net/NetworkInformation/IPv4InterfaceProperties.cs
@@ -1,6 +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.Runtime.Versioning;
+
namespace System.Net.NetworkInformation
{
///
@@ -11,21 +13,25 @@ public abstract class IPv4InterfaceProperties
///
/// Gets a bool value that indicates whether an interface uses Windows Internet Name Service (WINS).
///
+ [UnsupportedOSPlatform("android")]
public abstract bool UsesWins { get; }
///
/// Gets a bool value that indicates whether the interface is configured to use a dynamic host configuration protocol (DHCP) server to obtain an IP address.
///
+ [UnsupportedOSPlatform("android")]
public abstract bool IsDhcpEnabled { get; }
///
/// Gets a bool value that indicates whether this interface has an automatic private IP addressing (APIPA) address.
///
+ [UnsupportedOSPlatform("android")]
public abstract bool IsAutomaticPrivateAddressingActive { get; }
///
/// Gets a bool value that indicates whether this interface has automatic private IP addressing (APIPA) enabled.
///
+ [UnsupportedOSPlatform("android")]
public abstract bool IsAutomaticPrivateAddressingEnabled { get; }
///
@@ -36,6 +42,7 @@ public abstract class IPv4InterfaceProperties
///
/// Gets a bool value that indicates whether this interface can route packets.
///
+ [UnsupportedOSPlatform("android")]
public abstract bool IsForwardingEnabled { get; }
///
diff --git a/src/libraries/System.Net.NetworkInformation/src/System/Net/NetworkInformation/NetworkInterface.cs b/src/libraries/System.Net.NetworkInformation/src/System/Net/NetworkInformation/NetworkInterface.cs
index 94cb8fb0b9d81c..24f02186c3dc3a 100644
--- a/src/libraries/System.Net.NetworkInformation/src/System/Net/NetworkInformation/NetworkInterface.cs
+++ b/src/libraries/System.Net.NetworkInformation/src/System/Net/NetworkInformation/NetworkInterface.cs
@@ -70,6 +70,7 @@ public virtual IPInterfaceProperties GetIPProperties()
/// Provides Internet Protocol (IP) statistical data for this network interface.
///
/// The interface's IP statistics.
+ [UnsupportedOSPlatform("android")]
public virtual IPInterfaceStatistics GetIPStatistics()
{
throw NotImplemented.ByDesignWithMessage(SR.net_MethodNotImplementedException);
@@ -81,6 +82,7 @@ public virtual IPInterfaceStatistics GetIPStatistics()
/// Do not use this method, use GetIPStatistics instead.
///
/// The interface's IP statistics.
+ [UnsupportedOSPlatform("android")]
public virtual IPv4InterfaceStatistics GetIPv4Statistics()
{
throw NotImplemented.ByDesignWithMessage(SR.net_MethodNotImplementedException);
diff --git a/src/libraries/System.Net.NetworkInformation/src/System/Net/NetworkInformation/NetworkInterfacePal.Android.cs b/src/libraries/System.Net.NetworkInformation/src/System/Net/NetworkInformation/NetworkInterfacePal.Android.cs
new file mode 100644
index 00000000000000..820e01f093b34c
--- /dev/null
+++ b/src/libraries/System.Net.NetworkInformation/src/System/Net/NetworkInformation/NetworkInterfacePal.Android.cs
@@ -0,0 +1,110 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Runtime.InteropServices;
+
+namespace System.Net.NetworkInformation
+{
+ internal static class NetworkInterfacePal
+ {
+ /// Returns objects that describe the network interfaces on the local computer.
+ public static NetworkInterface[] GetAllNetworkInterfaces() => GetAndroidNetworkInterfaces();
+ public static bool GetIsNetworkAvailable() => TransformNetworkInterfacess(IsSomeNetworkUp);
+ public static int IPv6LoopbackInterfaceIndex => LoopbackInterfaceIndex;
+ public static int LoopbackInterfaceIndex => TransformNetworkInterfacess(FindLoopbackInterfaceIndex);
+
+ internal static unsafe AndroidNetworkInterface[] GetAndroidNetworkInterfaces()
+ => TransformNetworkInterfacess(ToAndroidNetworkInterfaceArray);
+
+ private static unsafe T TransformNetworkInterfacess(Func transform)
+ {
+ int interfaceCount = 0;
+ int addressCount = 0;
+ Interop.Sys.NetworkInterfaceInfo *networkInterfaceInfo = null;
+ Interop.Sys.IpAddressInfo *addressInfo = null;
+
+ if (Interop.Sys.GetNetworkInterfaces(ref interfaceCount, ref networkInterfaceInfo, ref addressCount, ref addressInfo) != 0)
+ {
+ string message = Interop.Sys.GetLastErrorInfo().GetErrorMessage();
+ throw new NetworkInformationException(message);
+ }
+
+ // the native implementation of Interop.Sys.GetNetworkInterfaces allocates one block of memory
+ // for both networkInterfaceInfo and addressInfo so we only need to call free once pointing at
+ // the start of the network interfaces list
+ var globalMemory = (IntPtr)networkInterfaceInfo;
+
+ try
+ {
+ return transform(interfaceCount, (IntPtr)networkInterfaceInfo, addressCount, (IntPtr)addressInfo);
+ }
+ finally
+ {
+ Marshal.FreeHGlobal(globalMemory);
+ }
+ }
+
+ private static unsafe AndroidNetworkInterface[] ToAndroidNetworkInterfaceArray(int interfaceCount, IntPtr networkInterfacesPtr, int addressCount, IntPtr addressPtr)
+ {
+ var networkInterfaces = new AndroidNetworkInterface[interfaceCount];
+
+ var networkInterfaceInfo = (Interop.Sys.NetworkInterfaceInfo*)networkInterfacesPtr;
+ for (int i = 0; i < interfaceCount; i++, networkInterfaceInfo++)
+ {
+ var name = Marshal.PtrToStringAnsi((IntPtr)networkInterfaceInfo->Name);
+ networkInterfaces[i] = new AndroidNetworkInterface(name!, networkInterfaceInfo);
+ }
+
+ var addressInfo = (Interop.Sys.IpAddressInfo*)addressPtr;
+ for (int i = 0; i < addressCount; i++, addressInfo++)
+ {
+ // there is usually just a handful of few network interfaces on Android devices
+ // and this linear search does not have any impact on performance
+ foreach (var networkInterface in networkInterfaces)
+ {
+ if (networkInterface.Index == addressInfo->InterfaceIndex)
+ {
+ networkInterface.AddAddress(addressInfo);
+ break;
+ }
+ }
+ }
+
+ return networkInterfaces;
+ }
+
+ private static unsafe int FindLoopbackInterfaceIndex(int interfaceCount, IntPtr networkInterfacesPtr, int addressCount, IntPtr addressPtr)
+ {
+ var networkInterfaceInfo = (Interop.Sys.NetworkInterfaceInfo*)networkInterfacesPtr;
+ for (int i = 0; i < interfaceCount; i++, networkInterfaceInfo++)
+ {
+ if (networkInterfaceInfo->HardwareType == (int)NetworkInterfaceType.Loopback)
+ {
+ return networkInterfaceInfo->InterfaceIndex;
+ }
+ }
+
+ throw new NetworkInformationException(SR.net_NoLoopback);
+ }
+
+ private static unsafe bool IsSomeNetworkUp(int interfaceCount, IntPtr networkInterfacesPtr, int addressCount, IntPtr addressPtr)
+ {
+ var networkInterfaceInfo = (Interop.Sys.NetworkInterfaceInfo*)networkInterfacesPtr;
+ for (int i = 0; i < interfaceCount; i++, networkInterfaceInfo++)
+ {
+ if (networkInterfaceInfo->HardwareType == (int)NetworkInterfaceType.Loopback
+ || networkInterfaceInfo->HardwareType == (int)NetworkInterfaceType.Tunnel)
+ {
+ continue;
+ }
+
+ if (networkInterfaceInfo->OperationalState == (int)OperationalStatus.Up)
+ {
+ return true;
+ }
+ }
+
+ return false;
+ }
+ }
+}
diff --git a/src/libraries/System.Net.NetworkInformation/src/System/Net/NetworkInformation/UnixIPGlobalProperties.cs b/src/libraries/System.Net.NetworkInformation/src/System/Net/NetworkInformation/UnixIPGlobalProperties.cs
index cca949a317a6f8..eafa42ff3fec12 100644
--- a/src/libraries/System.Net.NetworkInformation/src/System/Net/NetworkInformation/UnixIPGlobalProperties.cs
+++ b/src/libraries/System.Net.NetworkInformation/src/System/Net/NetworkInformation/UnixIPGlobalProperties.cs
@@ -13,6 +13,7 @@ namespace System.Net.NetworkInformation
internal abstract class UnixIPGlobalProperties : IPGlobalProperties
{
[UnsupportedOSPlatform("linux")]
+ [UnsupportedOSPlatform("android")]
[UnsupportedOSPlatform("osx")]
[UnsupportedOSPlatform("ios")]
[UnsupportedOSPlatform("tvos")]
@@ -26,6 +27,7 @@ internal abstract class UnixIPGlobalProperties : IPGlobalProperties
public override string HostName { get { return HostInformation.HostName; } }
[UnsupportedOSPlatform("linux")]
+ [UnsupportedOSPlatform("android")]
[UnsupportedOSPlatform("osx")]
[UnsupportedOSPlatform("ios")]
[UnsupportedOSPlatform("tvos")]
diff --git a/src/libraries/System.Net.NetworkInformation/src/System/Net/NetworkInformation/UnixNetworkInterface.cs b/src/libraries/System.Net.NetworkInformation/src/System/Net/NetworkInformation/UnixNetworkInterface.cs
index d248c72b6930cf..00c5b3a9a3028c 100644
--- a/src/libraries/System.Net.NetworkInformation/src/System/Net/NetworkInformation/UnixNetworkInterface.cs
+++ b/src/libraries/System.Net.NetworkInformation/src/System/Net/NetworkInformation/UnixNetworkInterface.cs
@@ -60,7 +60,7 @@ public override bool Supports(NetworkInterfaceComponent networkInterfaceComponen
public List UnicastAddress { get { return _unicastAddresses; } }
///
- /// Returns a list of all Unicast addresses of the interface's IP Addresses.
+ /// Returns a list of all Multicast addresses of the interface's IP Addresses.
///
public List? MulticastAddresess { get { return _multicastAddresses; } }
diff --git a/src/libraries/System.Net.NetworkInformation/tests/FunctionalTests/IPGlobalPropertiesTest.cs b/src/libraries/System.Net.NetworkInformation/tests/FunctionalTests/IPGlobalPropertiesTest.cs
index 860e64f216edbe..70804e19499e2f 100644
--- a/src/libraries/System.Net.NetworkInformation/tests/FunctionalTests/IPGlobalPropertiesTest.cs
+++ b/src/libraries/System.Net.NetworkInformation/tests/FunctionalTests/IPGlobalPropertiesTest.cs
@@ -26,7 +26,7 @@ public IPGlobalPropertiesTest(ITestOutputHelper output)
}
[Fact]
- [ActiveIssue("https://github.com/dotnet/runtime/issues/36890", TestPlatforms.iOS | TestPlatforms.tvOS | TestPlatforms.MacCatalyst)]
+ [SkipOnPlatform(TestPlatforms.Android, "Expected behavior is different on Android")]
public void IPGlobalProperties_AccessAllMethods_NoErrors()
{
IPGlobalProperties gp = IPGlobalProperties.GetIPGlobalProperties();
@@ -36,7 +36,7 @@ public void IPGlobalProperties_AccessAllMethods_NoErrors()
Assert.NotNull(gp.GetActiveUdpListeners());
Assert.NotNull(gp.GetIPv4GlobalStatistics());
- if (!OperatingSystem.IsMacOS() && !OperatingSystem.IsFreeBSD())
+ if (!OperatingSystem.IsMacOS() && !OperatingSystem.IsIOS() && !OperatingSystem.IsTvOS() && !OperatingSystem.IsFreeBSD())
{
// OSX and FreeBSD do not provide IPv6 stats.
Assert.NotNull(gp.GetIPv6GlobalStatistics());
@@ -50,9 +50,71 @@ public void IPGlobalProperties_AccessAllMethods_NoErrors()
Assert.NotNull(gp.GetUdpIPv6Statistics());
}
+ [Fact]
+ [PlatformSpecific(TestPlatforms.Android)]
+ public void IPGlobalProperties_AccessAllMethods_NoErrors_Android()
+ {
+ IPGlobalProperties gp = IPGlobalProperties.GetIPGlobalProperties();
+
+ Assert.NotNull(gp.GetIPv4GlobalStatistics());
+ Assert.NotNull(gp.GetIPv6GlobalStatistics());
+
+ Assert.Throws(() => gp.GetActiveTcpConnections());
+ Assert.Throws(() => gp.GetActiveTcpListeners());
+ Assert.Throws(() => gp.GetActiveUdpListeners());
+ Assert.Throws(() => gp.GetIcmpV4Statistics());
+ Assert.Throws(() => gp.GetIcmpV6Statistics());
+ Assert.Throws(() => gp.GetTcpIPv4Statistics());
+ Assert.Throws(() => gp.GetTcpIPv6Statistics());
+ Assert.Throws(() => gp.GetUdpIPv4Statistics());
+ Assert.Throws(() => gp.GetUdpIPv6Statistics());
+ }
+
+ [Theory]
+ [InlineData(4)]
+ [InlineData(6)]
+ [PlatformSpecific(TestPlatforms.Android)]
+ public void IPGlobalProperties_IPv4_IPv6_NoErrors_Android(int ipVersion)
+ {
+ IPGlobalProperties gp = IPGlobalProperties.GetIPGlobalProperties();
+ IPGlobalStatistics statistics = ipVersion switch {
+ 4 => gp.GetIPv4GlobalStatistics(),
+ 6 => gp.GetIPv6GlobalStatistics(),
+ _ => throw new ArgumentOutOfRangeException()
+ };
+
+ _log.WriteLine($"- IPv{ipVersion} statistics: -");
+ _log.WriteLine($"Number of interfaces: {statistics.NumberOfInterfaces}");
+ _log.WriteLine($"Number of IP addresses: {statistics.NumberOfIPAddresses}");
+
+ Assert.InRange(statistics.NumberOfInterfaces, 1, int.MaxValue);
+ Assert.InRange(statistics.NumberOfIPAddresses, 1, int.MaxValue);
+
+ Assert.Throws(() => statistics.DefaultTtl);
+ Assert.Throws(() => statistics.ForwardingEnabled);
+ Assert.Throws(() => statistics.OutputPacketRequests);
+ Assert.Throws(() => statistics.OutputPacketRoutingDiscards);
+ Assert.Throws(() => statistics.OutputPacketsDiscarded);
+ Assert.Throws(() => statistics.OutputPacketsWithNoRoute);
+ Assert.Throws(() => statistics.PacketFragmentFailures);
+ Assert.Throws(() => statistics.PacketReassembliesRequired);
+ Assert.Throws(() => statistics.PacketReassemblyFailures);
+ Assert.Throws(() => statistics.PacketReassemblyTimeout);
+ Assert.Throws(() => statistics.PacketsFragmented);
+ Assert.Throws(() => statistics.PacketsReassembled);
+ Assert.Throws(() => statistics.ReceivedPackets);
+ Assert.Throws(() => statistics.ReceivedPacketsDelivered);
+ Assert.Throws(() => statistics.ReceivedPacketsDiscarded);
+ Assert.Throws(() => statistics.ReceivedPacketsForwarded);
+ Assert.Throws(() => statistics.ReceivedPacketsWithAddressErrors);
+ Assert.Throws(() => statistics.ReceivedPacketsWithHeadersErrors);
+ Assert.Throws(() => statistics.ReceivedPacketsWithUnknownProtocol);
+ Assert.Throws(() => statistics.NumberOfRoutes);
+ }
+
[Theory]
[MemberData(nameof(Loopbacks))]
- [ActiveIssue("https://github.com/dotnet/runtime/issues/36890", TestPlatforms.iOS | TestPlatforms.tvOS | TestPlatforms.MacCatalyst)]
+ [SkipOnPlatform(TestPlatforms.Android, "Unsupported on Android")]
public void IPGlobalProperties_TcpListeners_Succeed(IPAddress address)
{
using (var server = new Socket(address.AddressFamily, SocketType.Stream, ProtocolType.Tcp))
@@ -78,7 +140,7 @@ public void IPGlobalProperties_TcpListeners_Succeed(IPAddress address)
[Theory]
[ActiveIssue("https://github.com/dotnet/runtime/issues/34690", TestPlatforms.Windows, TargetFrameworkMonikers.Netcoreapp, TestRuntimes.Mono)]
- [ActiveIssue("https://github.com/dotnet/runtime/issues/36890", TestPlatforms.iOS | TestPlatforms.tvOS | TestPlatforms.MacCatalyst)]
+ [PlatformSpecific(~(TestPlatforms.iOS | TestPlatforms.tvOS | TestPlatforms.Android))]
[MemberData(nameof(Loopbacks))]
public async Task IPGlobalProperties_TcpActiveConnections_Succeed(IPAddress address)
{
@@ -109,6 +171,7 @@ public async Task IPGlobalProperties_TcpActiveConnections_Succeed(IPAddress addr
}
[Fact]
+ [SkipOnPlatform(TestPlatforms.Android, "Unsupported on Android")]
public void IPGlobalProperties_TcpActiveConnections_NotListening()
{
TcpConnectionInformation[] tcpCconnections = IPGlobalProperties.GetIPGlobalProperties().GetActiveTcpConnections();
@@ -119,7 +182,6 @@ public void IPGlobalProperties_TcpActiveConnections_NotListening()
}
[Fact]
- [ActiveIssue("https://github.com/dotnet/runtime/issues/50567", TestPlatforms.Android)]
public async Task GetUnicastAddresses_NotEmpty()
{
IPGlobalProperties props = IPGlobalProperties.GetIPGlobalProperties();
diff --git a/src/libraries/System.Net.NetworkInformation/tests/FunctionalTests/IPInterfacePropertiesTest_Android.cs b/src/libraries/System.Net.NetworkInformation/tests/FunctionalTests/IPInterfacePropertiesTest_Android.cs
new file mode 100644
index 00000000000000..61e57c854aa479
--- /dev/null
+++ b/src/libraries/System.Net.NetworkInformation/tests/FunctionalTests/IPInterfacePropertiesTest_Android.cs
@@ -0,0 +1,221 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Linq;
+using System.Net.Http.Functional.Tests;
+using System.Net.Sockets;
+using System.Net.Test.Common;
+using System.Threading.Tasks;
+
+using Xunit;
+using Xunit.Abstractions;
+
+namespace System.Net.NetworkInformation.Tests
+{
+ [PlatformSpecific(TestPlatforms.Android)]
+ public class IPInterfacePropertiesTest_Android
+ {
+ private readonly ITestOutputHelper _log;
+
+ public IPInterfacePropertiesTest_Android(ITestOutputHelper output)
+ {
+ _log = output;
+ }
+
+ [Fact]
+ public async Task IPInfoTest_AccessAllProperties_NoErrors()
+ {
+ await Task.Run(() =>
+ {
+ foreach (NetworkInterface nic in NetworkInterface.GetAllNetworkInterfaces())
+ {
+ _log.WriteLine("Nic: " + nic.Name);
+ _log.WriteLine("- Speed:" + nic.Speed);
+ Assert.Equal(-1, nic.Speed);
+ _log.WriteLine("- Supports IPv4: " + nic.Supports(NetworkInterfaceComponent.IPv4));
+ _log.WriteLine("- Supports IPv6: " + nic.Supports(NetworkInterfaceComponent.IPv6));
+ Assert.False(nic.IsReceiveOnly);
+
+ IPInterfaceProperties ipProperties = nic.GetIPProperties();
+
+ Assert.NotNull(ipProperties);
+
+ Assert.Throws(() => ipProperties.AnycastAddresses);
+ Assert.Throws(() => ipProperties.DhcpServerAddresses);
+ Assert.Throws(() => ipProperties.DnsAddresses);
+ Assert.Throws(() => ipProperties.DnsSuffix);
+ Assert.Throws(() => ipProperties.GatewayAddresses);
+ Assert.Throws(() => ipProperties.IsDnsEnabled);
+ Assert.Throws(() => ipProperties.IsDynamicDnsEnabled);
+
+ Assert.NotNull(ipProperties.MulticastAddresses);
+ _log.WriteLine("- Multicast Addresses: " + ipProperties.MulticastAddresses.Count);
+ foreach (IPAddressInformation multi in ipProperties.MulticastAddresses)
+ {
+ _log.WriteLine("-- " + multi.Address.ToString());
+ Assert.Throws(() => multi.IsDnsEligible);
+ Assert.Throws(() => multi.IsTransient);
+ }
+
+ Assert.NotNull(ipProperties.UnicastAddresses);
+ _log.WriteLine("- Unicast Addresses: " + ipProperties.UnicastAddresses.Count);
+ foreach (UnicastIPAddressInformation uni in ipProperties.UnicastAddresses)
+ {
+ _log.WriteLine("-- " + uni.Address.ToString());
+ Assert.Throws(() => uni.AddressPreferredLifetime);
+ Assert.Throws(() => uni.AddressValidLifetime);
+ Assert.Throws(() => uni.DhcpLeaseLifetime);
+ Assert.Throws(() => uni.DuplicateAddressDetectionState);
+
+ Assert.NotNull(uni.IPv4Mask);
+ _log.WriteLine("--- IPv4 Mask: " + uni.IPv4Mask);
+ Assert.Throws(() => uni.IsDnsEligible);
+ Assert.Throws(() => uni.IsTransient);
+ Assert.Throws(() => uni.PrefixOrigin);
+ Assert.Throws(() => uni.SuffixOrigin);
+
+ // Prefix Length
+ _log.WriteLine("--- PrefixLength: " + uni.PrefixLength);
+ Assert.True(uni.PrefixLength > 0);
+ Assert.True((uni.Address.AddressFamily == AddressFamily.InterNetwork ? 33 : 129) > uni.PrefixLength);
+ }
+
+ Assert.Throws(() => ipProperties.WinsServersAddresses);
+ }
+ }).WaitAsync(TestHelper.PassingTestTimeout);
+ }
+
+ [Fact]
+ public async Task IPInfoTest_AccessAllIPv4Properties_NoErrors()
+ {
+ await Task.Run(() =>
+ {
+ foreach (NetworkInterface nic in NetworkInterface.GetAllNetworkInterfaces())
+ {
+ _log.WriteLine("Nic: " + nic.Name);
+
+ IPInterfaceProperties ipProperties = nic.GetIPProperties();
+
+ _log.WriteLine("IPv4 Properties:");
+
+ IPv4InterfaceProperties ipv4Properties = ipProperties.GetIPv4Properties();
+
+ _log.WriteLine("Index: " + ipv4Properties.Index);
+ Assert.Throws(() => ipv4Properties.IsAutomaticPrivateAddressingActive);
+ Assert.Throws(() => ipv4Properties.IsAutomaticPrivateAddressingEnabled);
+ Assert.Throws(() => ipv4Properties.IsDhcpEnabled);
+ Assert.Throws(() => ipv4Properties.IsForwardingEnabled);
+ _log.WriteLine("Mtu: " + ipv4Properties.Mtu);
+ Assert.Throws(() => ipv4Properties.UsesWins);
+ }
+ }).WaitAsync(TestHelper.PassingTestTimeout);
+ }
+
+ [Fact]
+ public async Task IPInfoTest_AccessAllIPv6Properties_NoErrors()
+ {
+ await Task.Run(() =>
+ {
+ foreach (NetworkInterface nic in NetworkInterface.GetAllNetworkInterfaces())
+ {
+ _log.WriteLine("Nic: " + nic.Name);
+
+ IPInterfaceProperties ipProperties = nic.GetIPProperties();
+
+ _log.WriteLine("IPv6 Properties:");
+
+ IPv6InterfaceProperties ipv6Properties = ipProperties.GetIPv6Properties();
+
+ if (ipv6Properties == null)
+ {
+ _log.WriteLine("IPv6Properties is null");
+ continue;
+ }
+
+ _log.WriteLine("Index: " + ipv6Properties.Index);
+ _log.WriteLine("Mtu: " + ipv6Properties.Mtu);
+ _log.WriteLine("Scope: " + ipv6Properties.GetScopeId(ScopeLevel.Link));
+ }
+ }).WaitAsync(TestHelper.PassingTestTimeout);
+ }
+
+ [Fact]
+ [Trait("IPv6", "true")]
+ public async Task IPv6ScopeId_AccessAllValues_Success()
+ {
+ await Task.Run(() =>
+ {
+ Assert.True(Capability.IPv6Support());
+
+ foreach (NetworkInterface nic in NetworkInterface.GetAllNetworkInterfaces())
+ {
+ _log.WriteLine("Nic: " + nic.Name);
+
+ if (!nic.Supports(NetworkInterfaceComponent.IPv6))
+ {
+ continue;
+ }
+
+ IPInterfaceProperties ipProperties = nic.GetIPProperties();
+
+ IPv6InterfaceProperties ipv6Properties = ipProperties.GetIPv6Properties();
+
+ Array values = Enum.GetValues(typeof(ScopeLevel));
+ foreach (ScopeLevel level in values)
+ {
+ _log.WriteLine("-- Level: " + level + "; " + ipv6Properties.GetScopeId(level));
+ }
+ }
+ }).WaitAsync(TestHelper.PassingTestTimeout);
+ }
+
+ [Fact]
+ [Trait("IPv4", "true")]
+ public async Task IPInfoTest_IPv4Loopback_ProperAddress()
+ {
+ await Task.Run(() =>
+ {
+ Assert.True(Capability.IPv4Support());
+
+ _log.WriteLine("Loopback IPv4 index: " + NetworkInterface.LoopbackInterfaceIndex);
+
+ NetworkInterface loopback = NetworkInterface.GetAllNetworkInterfaces().First(ni => ni.Name == "lo");
+ Assert.NotNull(loopback);
+
+ foreach (UnicastIPAddressInformation unicast in loopback.GetIPProperties().UnicastAddresses)
+ {
+ if (unicast.Address.Equals(IPAddress.Loopback))
+ {
+ Assert.Equal(IPAddress.Parse("255.0.0.0"), unicast.IPv4Mask);
+ Assert.Equal(8, unicast.PrefixLength);
+ break;
+ }
+ }
+ }).WaitAsync(TestHelper.PassingTestTimeout);
+ }
+
+ [Fact]
+ [Trait("IPv6", "true")]
+ public async Task IPInfoTest_IPv6Loopback_ProperAddress()
+ {
+ await Task.Run(() =>
+ {
+ Assert.True(Capability.IPv6Support());
+
+ _log.WriteLine("Loopback IPv6 index: " + NetworkInterface.IPv6LoopbackInterfaceIndex);
+
+ NetworkInterface loopback = NetworkInterface.GetAllNetworkInterfaces().First(ni => ni.Name == "lo");
+ Assert.NotNull(loopback);
+
+ foreach (UnicastIPAddressInformation unicast in loopback.GetIPProperties().UnicastAddresses)
+ {
+ if (unicast.Address.Equals(IPAddress.IPv6Loopback))
+ {
+ Assert.Equal(128, unicast.PrefixLength);
+ break;
+ }
+ }
+ }).WaitAsync(TestHelper.PassingTestTimeout);
+ }
+ }
+}
diff --git a/src/libraries/System.Net.NetworkInformation/tests/FunctionalTests/NetworkInterfaceBasicTest.cs b/src/libraries/System.Net.NetworkInformation/tests/FunctionalTests/NetworkInterfaceBasicTest.cs
index 3455f06297d793..c022f74b2c234c 100644
--- a/src/libraries/System.Net.NetworkInformation/tests/FunctionalTests/NetworkInterfaceBasicTest.cs
+++ b/src/libraries/System.Net.NetworkInformation/tests/FunctionalTests/NetworkInterfaceBasicTest.cs
@@ -20,7 +20,6 @@ public NetworkInterfaceBasicTest(ITestOutputHelper output)
}
[Fact]
- [ActiveIssue("https://github.com/dotnet/runtime/issues/50567", TestPlatforms.Android)]
public void BasicTest_GetNetworkInterfaces_AtLeastOne()
{
Assert.NotEqual(0, NetworkInterface.GetAllNetworkInterfaces().Length);
@@ -57,7 +56,7 @@ public void BasicTest_AccessInstanceProperties_NoExceptions()
}
[Fact]
- [PlatformSpecific(TestPlatforms.Linux)] // Some APIs are not supported on Linux
+ [PlatformSpecific(TestPlatforms.Linux|TestPlatforms.Android)] // Some APIs are not supported on Linux and Android
public void BasicTest_AccessInstanceProperties_NoExceptions_Linux()
{
foreach (NetworkInterface nic in NetworkInterface.GetAllNetworkInterfaces())
@@ -132,7 +131,6 @@ public void BasicTest_AccessInstanceProperties_NoExceptions_Bsd()
[Fact]
[Trait("IPv4", "true")]
- [ActiveIssue("https://github.com/dotnet/runtime/issues/50567", TestPlatforms.Android)]
public void BasicTest_StaticLoopbackIndex_MatchesLoopbackNetworkInterface()
{
Assert.True(Capability.IPv4Support());
@@ -156,7 +154,6 @@ public void BasicTest_StaticLoopbackIndex_MatchesLoopbackNetworkInterface()
[Fact]
[Trait("IPv4", "true")]
- [ActiveIssue("https://github.com/dotnet/runtime/issues/50567", TestPlatforms.Android)]
public void BasicTest_StaticLoopbackIndex_ExceptionIfV4NotSupported()
{
Assert.True(Capability.IPv4Support());
@@ -166,7 +163,6 @@ public void BasicTest_StaticLoopbackIndex_ExceptionIfV4NotSupported()
[Fact]
[Trait("IPv6", "true")]
- [ActiveIssue("https://github.com/dotnet/runtime/issues/50567", TestPlatforms.Android)]
public void BasicTest_StaticIPv6LoopbackIndex_MatchesLoopbackNetworkInterface()
{
Assert.True(Capability.IPv6Support());
@@ -191,7 +187,6 @@ public void BasicTest_StaticIPv6LoopbackIndex_MatchesLoopbackNetworkInterface()
[Fact]
[Trait("IPv6", "true")]
- [ActiveIssue("https://github.com/dotnet/runtime/issues/50567", TestPlatforms.Android)]
public void BasicTest_StaticIPv6LoopbackIndex_ExceptionIfV6NotSupported()
{
Assert.True(Capability.IPv6Support());
@@ -272,8 +267,6 @@ public void BasicTest_GetIPInterfaceStatistics_Success_Bsd()
[Fact]
- [ActiveIssue("https://github.com/dotnet/runtime/issues/50567", TestPlatforms.Android)]
- [ActiveIssue("https://github.com/dotnet/runtime/issues/36890", TestPlatforms.iOS | TestPlatforms.tvOS | TestPlatforms.MacCatalyst)]
public void BasicTest_GetIsNetworkAvailable_Success()
{
Assert.True(NetworkInterface.GetIsNetworkAvailable());
@@ -285,7 +278,6 @@ public void BasicTest_GetIsNetworkAvailable_Success()
[SkipOnPlatform(TestPlatforms.iOS | TestPlatforms.MacCatalyst | TestPlatforms.tvOS, "Not supported on Browser, iOS, MacCatalyst, or tvOS.")]
[InlineData(false)]
[InlineData(true)]
- [ActiveIssue("https://github.com/dotnet/runtime/issues/50567", TestPlatforms.Android)]
public async Task NetworkInterface_LoopbackInterfaceIndex_MatchesReceivedPackets(bool ipv6)
{
using (var client = new Socket(SocketType.Dgram, ProtocolType.Udp))
diff --git a/src/libraries/System.Net.NetworkInformation/tests/FunctionalTests/NetworkInterfaceIPv4Statistics.cs b/src/libraries/System.Net.NetworkInformation/tests/FunctionalTests/NetworkInterfaceIPv4Statistics.cs
index 52aceb0d3f9c14..9b73374e99b267 100644
--- a/src/libraries/System.Net.NetworkInformation/tests/FunctionalTests/NetworkInterfaceIPv4Statistics.cs
+++ b/src/libraries/System.Net.NetworkInformation/tests/FunctionalTests/NetworkInterfaceIPv4Statistics.cs
@@ -69,6 +69,17 @@ public void BasicTest_GetIPv4InterfaceStatistics_Success_Linux()
}
}
+ [Fact]
+ [PlatformSpecific(TestPlatforms.Android)] // This API is not supported on Android
+ public void BasicTest_GetIPv4InterfaceStatistics_NotSupported_Android()
+ {
+ // This API is not actually IPv4 specific.
+ foreach (NetworkInterface nic in NetworkInterface.GetAllNetworkInterfaces())
+ {
+ Assert.Throws(() => nic.GetIPv4Statistics());
+ }
+ }
+
[Fact]
[PlatformSpecific(TestPlatforms.OSX)] // Some APIs are not supported on OSX
public void BasicTest_GetIPv4InterfaceStatistics_Success_OSX()
diff --git a/src/libraries/System.Net.Ping/tests/FunctionalTests/PingTest.cs b/src/libraries/System.Net.Ping/tests/FunctionalTests/PingTest.cs
index b206e1e0f165d9..32ef250d8657eb 100644
--- a/src/libraries/System.Net.Ping/tests/FunctionalTests/PingTest.cs
+++ b/src/libraries/System.Net.Ping/tests/FunctionalTests/PingTest.cs
@@ -878,7 +878,9 @@ public async Task SendPingToExternalHostWithLowTtlTest()
options.Ttl = 1;
// This should always fail unless host is one IP hop away.
pingReply = await ping.SendPingAsync(host, TestSettings.PingTimeout, TestSettings.PayloadAsBytesShort, options);
- Assert.NotEqual(IPStatus.Success, pingReply.Status);
+
+ Assert.True(pingReply.Status == IPStatus.TimeExceeded || pingReply.Status == IPStatus.TtlExpired);
+ Assert.NotEqual(IPAddress.Any, pingReply.Address);
}
[Fact]
diff --git a/src/libraries/System.Net.Ping/tests/FunctionalTests/UnixPingUtilityTests.cs b/src/libraries/System.Net.Ping/tests/FunctionalTests/UnixPingUtilityTests.cs
index 0d686f9a8ee4ad..b34f45bdd881f7 100644
--- a/src/libraries/System.Net.Ping/tests/FunctionalTests/UnixPingUtilityTests.cs
+++ b/src/libraries/System.Net.Ping/tests/FunctionalTests/UnixPingUtilityTests.cs
@@ -8,6 +8,7 @@
using System.Threading.Tasks;
using Xunit;
+using Microsoft.DotNet.XUnitExtensions;
namespace System.Net.NetworkInformation.Tests
{
@@ -19,7 +20,7 @@ public class UnixPingUtilityTests
{
private const int IcmpHeaderLengthInBytes = 8;
- [Theory]
+ [ConditionalTheory]
[InlineData(0)]
[InlineData(100)]
[InlineData(1000)]
@@ -32,13 +33,26 @@ public static void TimeoutIsRespected(int timeout)
p.StartInfo.RedirectStandardError = true;
p.StartInfo.RedirectStandardOutput = true;
+ bool destinationNetUnreachable = false;
+ p.OutputDataReceived += delegate (object sendingProcess, DataReceivedEventArgs outputLine)
+ {
+ if (outputLine.Data?.Contains("Destination Net Unreachable", StringComparison.OrdinalIgnoreCase) == true)
+ destinationNetUnreachable = true;
+ };
+
Stopwatch stopWatch = Stopwatch.StartNew();
p.Start();
+ p.BeginOutputReadLine();
p.WaitForExit();
- //ensure that the process takes longer than or equal to 'timeout'
- Assert.True(stopWatch.ElapsedMilliseconds >= timeout);
+ if (destinationNetUnreachable)
+ {
+ throw new SkipTestException($"Network doesn't route {TestSettings.UnreachableAddress}, skipping test.");
+ }
+
+ //ensure that the process takes longer than or within 10ms of 'timeout', with a 5s maximum
+ Assert.InRange(stopWatch.ElapsedMilliseconds, timeout - 10, 5000);
}
[ConditionalTheory(typeof(PlatformDetection), nameof(PlatformDetection.IsThreadingSupported))]
diff --git a/src/libraries/System.Net.Quic/ref/System.Net.Quic.cs b/src/libraries/System.Net.Quic/ref/System.Net.Quic.cs
index 790ad3feb2939d..be0b43d4200f37 100644
--- a/src/libraries/System.Net.Quic/ref/System.Net.Quic.cs
+++ b/src/libraries/System.Net.Quic/ref/System.Net.Quic.cs
@@ -109,6 +109,7 @@ public override void Flush() { }
public override void SetLength(long value) { }
public void Shutdown() { }
public System.Threading.Tasks.ValueTask ShutdownCompleted(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+ public System.Threading.Tasks.ValueTask WaitForWriteCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
public override void Write(byte[] buffer, int offset, int count) { }
public override void Write(System.ReadOnlySpan buffer) { }
public System.Threading.Tasks.ValueTask WriteAsync(System.Buffers.ReadOnlySequence buffers, bool endStream, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
diff --git a/src/libraries/System.Net.Quic/src/System.Net.Quic.csproj b/src/libraries/System.Net.Quic/src/System.Net.Quic.csproj
index 4549842ee8e681..58f158d9a6cef5 100644
--- a/src/libraries/System.Net.Quic/src/System.Net.Quic.csproj
+++ b/src/libraries/System.Net.Quic/src/System.Net.Quic.csproj
@@ -100,7 +100,8 @@
+ GeneratePathProperty="true"
+ Condition="'$(DotNetBuildFromSource)' != 'true'" />
@@ -128,7 +129,7 @@
+ ('$(TargetArchitecture)' == 'x64' or '$(TargetArchitecture)' == 'x86') and '$(DotNetBuildFromSource)' != 'true'">
diff --git a/src/libraries/System.Net.Quic/src/System/Net/Quic/Implementations/Mock/MockConnection.cs b/src/libraries/System.Net.Quic/src/System/Net/Quic/Implementations/Mock/MockConnection.cs
index 7487a958db91f9..e409b962d0296e 100644
--- a/src/libraries/System.Net.Quic/src/System/Net/Quic/Implementations/Mock/MockConnection.cs
+++ b/src/libraries/System.Net.Quic/src/System/Net/Quic/Implementations/Mock/MockConnection.cs
@@ -8,6 +8,8 @@
using System.Threading;
using System.Threading.Channels;
using System.Threading.Tasks;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
namespace System.Net.Quic.Implementations.Mock
{
@@ -244,6 +246,9 @@ internal MockStream OpenStream(long streamId, bool bidirectional)
}
MockStream.StreamState streamState = new MockStream.StreamState(streamId, bidirectional);
+ // TODO Streams are never removed from a connection. Consider cleaning up in the future.
+ state._streams[streamState._streamId] = streamState;
+
Channel streamChannel = _isClient ? state._clientInitiatedStreamChannel : state._serverInitiatedStreamChannel;
streamChannel.Writer.TryWrite(streamState);
@@ -320,6 +325,12 @@ internal override ValueTask CloseAsync(long errorCode, CancellationToken cancell
state._serverErrorCode = errorCode;
DrainAcceptQueue(errorCode, -1);
}
+
+ foreach (KeyValuePair kvp in state._streams)
+ {
+ kvp.Value._outboundWritesCompletedTcs.TrySetException(new QuicConnectionAbortedException(errorCode));
+ kvp.Value._inboundWritesCompletedTcs.TrySetException(new QuicConnectionAbortedException(errorCode));
+ }
}
Dispose();
@@ -474,8 +485,9 @@ public PeerStreamLimit(int maxUnidirectional, int maxBidirectional)
internal sealed class ConnectionState
{
public readonly SslApplicationProtocol _applicationProtocol;
- public Channel _clientInitiatedStreamChannel;
- public Channel _serverInitiatedStreamChannel;
+ public readonly Channel _clientInitiatedStreamChannel;
+ public readonly Channel _serverInitiatedStreamChannel;
+ public readonly ConcurrentDictionary _streams;
public PeerStreamLimit? _clientStreamLimit;
public PeerStreamLimit? _serverStreamLimit;
@@ -490,6 +502,7 @@ public ConnectionState(SslApplicationProtocol applicationProtocol)
_clientInitiatedStreamChannel = Channel.CreateUnbounded();
_serverInitiatedStreamChannel = Channel.CreateUnbounded();
_clientErrorCode = _serverErrorCode = -1;
+ _streams = new ConcurrentDictionary();
}
}
}
diff --git a/src/libraries/System.Net.Quic/src/System/Net/Quic/Implementations/Mock/MockStream.cs b/src/libraries/System.Net.Quic/src/System/Net/Quic/Implementations/Mock/MockStream.cs
index 588da85d32f420..fbace756f2fbda 100644
--- a/src/libraries/System.Net.Quic/src/System/Net/Quic/Implementations/Mock/MockStream.cs
+++ b/src/libraries/System.Net.Quic/src/System/Net/Quic/Implementations/Mock/MockStream.cs
@@ -164,6 +164,7 @@ internal override async ValueTask WriteAsync(ReadOnlyMemory buffer, bool e
if (endStream)
{
streamBuffer.EndWrite();
+ WritesCompletedTcs.TrySetResult();
}
}
@@ -206,10 +207,12 @@ internal override void AbortRead(long errorCode)
if (_isInitiator)
{
_streamState._outboundWriteErrorCode = errorCode;
+ _streamState._inboundWritesCompletedTcs.TrySetException(new QuicStreamAbortedException(errorCode));
}
else
{
_streamState._inboundWriteErrorCode = errorCode;
+ _streamState._outboundWritesCompletedTcs.TrySetException(new QuicOperationAbortedException());
}
ReadStreamBuffer?.AbortRead();
@@ -220,10 +223,12 @@ internal override void AbortWrite(long errorCode)
if (_isInitiator)
{
_streamState._outboundReadErrorCode = errorCode;
+ _streamState._outboundWritesCompletedTcs.TrySetException(new QuicStreamAbortedException(errorCode));
}
else
{
_streamState._inboundReadErrorCode = errorCode;
+ _streamState._inboundWritesCompletedTcs.TrySetException(new QuicOperationAbortedException());
}
WriteStreamBuffer?.EndWrite();
@@ -251,6 +256,8 @@ internal override void Shutdown()
{
_connection.LocalStreamLimit!.Bidirectional.Decrement();
}
+
+ WritesCompletedTcs.TrySetResult();
}
private void CheckDisposed()
@@ -283,6 +290,17 @@ public override ValueTask DisposeAsync()
return default;
}
+ internal override ValueTask WaitForWriteCompletionAsync(CancellationToken cancellationToken = default)
+ {
+ CheckDisposed();
+
+ return new ValueTask(WritesCompletedTcs.Task);
+ }
+
+ private TaskCompletionSource WritesCompletedTcs => _isInitiator
+ ? _streamState._outboundWritesCompletedTcs
+ : _streamState._inboundWritesCompletedTcs;
+
internal sealed class StreamState
{
public readonly long _streamId;
@@ -292,6 +310,8 @@ internal sealed class StreamState
public long _inboundReadErrorCode;
public long _outboundWriteErrorCode;
public long _inboundWriteErrorCode;
+ public TaskCompletionSource _outboundWritesCompletedTcs;
+ public TaskCompletionSource _inboundWritesCompletedTcs;
private const int InitialBufferSize =
#if DEBUG
@@ -310,6 +330,8 @@ public StreamState(long streamId, bool bidirectional)
_streamId = streamId;
_outboundStreamBuffer = new StreamBuffer(initialBufferSize: InitialBufferSize, maxBufferSize: MaxBufferSize);
_inboundStreamBuffer = (bidirectional ? new StreamBuffer() : null);
+ _outboundWritesCompletedTcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
+ _inboundWritesCompletedTcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
}
}
}
diff --git a/src/libraries/System.Net.Quic/src/System/Net/Quic/Implementations/MsQuic/MsQuicConnection.cs b/src/libraries/System.Net.Quic/src/System/Net/Quic/Implementations/MsQuic/MsQuicConnection.cs
index ddd002d59d2c2e..e67f2ee60846f3 100644
--- a/src/libraries/System.Net.Quic/src/System/Net/Quic/Implementations/MsQuic/MsQuicConnection.cs
+++ b/src/libraries/System.Net.Quic/src/System/Net/Quic/Implementations/MsQuic/MsQuicConnection.cs
@@ -283,6 +283,11 @@ private static uint HandleEventShutdownInitiatedByTransport(State state, ref Con
state.ConnectTcs = null;
}
+ // To throw QuicConnectionAbortedException (instead of QuicOperationAbortedException) out of AcceptStreamAsync() since
+ // it wasn't our side who shutdown the connection.
+ // We should rather keep the Status and propagate it either in a different exception or as a different field of QuicConnectionAbortedException.
+ // See: https://github.com/dotnet/runtime/issues/60133
+ state.AbortErrorCode = 0;
state.AcceptQueue.Writer.TryComplete();
return MsQuicStatusCodes.Success;
}
diff --git a/src/libraries/System.Net.Quic/src/System/Net/Quic/Implementations/MsQuic/MsQuicStream.cs b/src/libraries/System.Net.Quic/src/System/Net/Quic/Implementations/MsQuic/MsQuicStream.cs
index bbaf9c4ed41bb7..54f0ed3f4ec85b 100644
--- a/src/libraries/System.Net.Quic/src/System/Net/Quic/Implementations/MsQuic/MsQuicStream.cs
+++ b/src/libraries/System.Net.Quic/src/System/Net/Quic/Implementations/MsQuic/MsQuicStream.cs
@@ -69,6 +69,11 @@ private sealed class State
// Resettable completions to be used for multiple calls to send.
public readonly ResettableCompletionSource SendResettableCompletionSource = new ResettableCompletionSource();
+ public ShutdownWriteState ShutdownWriteState;
+
+ // Set once writes have been shutdown.
+ public readonly TaskCompletionSource ShutdownWriteCompletionSource = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
+
public ShutdownState ShutdownState;
// The value makes sure that we release the handles only once.
public int ShutdownDone;
@@ -95,6 +100,14 @@ public void Cleanup()
// inbound.
internal MsQuicStream(MsQuicConnection.State connectionState, SafeMsQuicStreamHandle streamHandle, QUIC_STREAM_OPEN_FLAGS flags)
{
+ if (!connectionState.TryAddStream(this))
+ {
+ throw new ObjectDisposedException(nameof(QuicConnection));
+ }
+ // this assignment should be done before SetCallbackHandlerDelegate to prevent NRE in HandleEventConnectionClose
+ // but after TryAddStream to prevent unnecessary RemoveStream in finalizer
+ _state.ConnectionState = connectionState;
+
_state.Handle = streamHandle;
_canRead = true;
_canWrite = !flags.HasFlag(QUIC_STREAM_OPEN_FLAGS.UNIDIRECTIONAL);
@@ -117,14 +130,6 @@ internal MsQuicStream(MsQuicConnection.State connectionState, SafeMsQuicStreamHa
throw;
}
- if (!connectionState.TryAddStream(this))
- {
- _state.StateGCHandle.Free();
- throw new ObjectDisposedException(nameof(QuicConnection));
- }
-
- _state.ConnectionState = connectionState;
-
_state.TraceId = MsQuicTraceHelper.GetTraceId(_state.Handle);
if (NetEventSource.Log.IsEnabled())
{
@@ -140,6 +145,14 @@ internal MsQuicStream(MsQuicConnection.State connectionState, QUIC_STREAM_OPEN_F
{
Debug.Assert(connectionState.Handle != null);
+ if (!connectionState.TryAddStream(this))
+ {
+ throw new ObjectDisposedException(nameof(QuicConnection));
+ }
+ // this assignment should be done before StreamOpenDelegate to prevent NRE in HandleEventConnectionClose
+ // but after TryAddStream to prevent unnecessary RemoveStream in finalizer
+ _state.ConnectionState = connectionState;
+
_canRead = !flags.HasFlag(QUIC_STREAM_OPEN_FLAGS.UNIDIRECTIONAL);
_canWrite = true;
@@ -170,15 +183,6 @@ internal MsQuicStream(MsQuicConnection.State connectionState, QUIC_STREAM_OPEN_F
throw;
}
- if (!connectionState.TryAddStream(this))
- {
- _state.Handle?.Dispose();
- _state.StateGCHandle.Free();
- throw new ObjectDisposedException(nameof(QuicConnection));
- }
-
- _state.ConnectionState = connectionState;
-
_state.TraceId = MsQuicTraceHelper.GetTraceId(_state.Handle);
if (NetEventSource.Log.IsEnabled())
{
@@ -265,7 +269,7 @@ internal override async ValueTask WriteAsync(ReadOnlySequence buffers, boo
{
ThrowIfDisposed();
- using CancellationTokenRegistration registration = HandleWriteStartState(cancellationToken);
+ using CancellationTokenRegistration registration = HandleWriteStartState(buffers.IsEmpty, cancellationToken);
await SendReadOnlySequenceAsync(buffers, endStream ? QUIC_SEND_FLAGS.FIN : QUIC_SEND_FLAGS.NONE).ConfigureAwait(false);
@@ -281,7 +285,7 @@ internal override async ValueTask WriteAsync(ReadOnlyMemory
{
ThrowIfDisposed();
- using CancellationTokenRegistration registration = HandleWriteStartState(cancellationToken);
+ using CancellationTokenRegistration registration = HandleWriteStartState(buffers.IsEmpty, cancellationToken);
await SendReadOnlyMemoryListAsync(buffers, endStream ? QUIC_SEND_FLAGS.FIN : QUIC_SEND_FLAGS.NONE).ConfigureAwait(false);
@@ -292,20 +296,20 @@ internal override async ValueTask WriteAsync(ReadOnlyMemory buffer, bool e
{
ThrowIfDisposed();
- using CancellationTokenRegistration registration = HandleWriteStartState(cancellationToken);
+ using CancellationTokenRegistration registration = HandleWriteStartState(buffer.IsEmpty, cancellationToken);
await SendReadOnlyMemoryAsync(buffer, endStream ? QUIC_SEND_FLAGS.FIN : QUIC_SEND_FLAGS.NONE).ConfigureAwait(false);
HandleWriteCompletedState();
}
- private CancellationTokenRegistration HandleWriteStartState(CancellationToken cancellationToken)
+ private CancellationTokenRegistration HandleWriteStartState(bool emptyBuffer, CancellationToken cancellationToken)
{
if (_state.SendState == SendState.Closed)
{
throw new InvalidOperationException(SR.net_quic_writing_notallowed);
}
- else if ( _state.SendState == SendState.Aborted)
+ if (_state.SendState == SendState.Aborted)
{
if (_state.SendErrorCode != -1)
{
@@ -363,10 +367,14 @@ private CancellationTokenRegistration HandleWriteStartState(CancellationToken ca
throw new OperationCanceledException(SR.net_quic_sending_aborted);
}
- else if (_state.SendState == SendState.ConnectionClosed)
+ if (_state.SendState == SendState.ConnectionClosed)
{
throw GetConnectionAbortedException(_state);
}
+
+ // Change the state in the same lock where we check for final states to prevent coming back from Aborted/ConnectionClosed.
+ Debug.Assert(_state.SendState != SendState.Pending);
+ _state.SendState = emptyBuffer ? SendState.Finished : SendState.Pending;
}
return registration;
@@ -574,12 +582,26 @@ internal override void AbortWrite(long errorCode)
return;
}
+ bool shouldComplete = false;
+
lock (_state)
{
if (_state.SendState < SendState.Aborted)
{
_state.SendState = SendState.Aborted;
}
+
+ if (_state.ShutdownWriteState == ShutdownWriteState.None)
+ {
+ _state.ShutdownWriteState = ShutdownWriteState.Canceled;
+ shouldComplete = true;
+ }
+ }
+
+ if (shouldComplete)
+ {
+ _state.ShutdownWriteCompletionSource.SetException(
+ ExceptionDispatchInfo.SetCurrentStackTrace(new QuicOperationAbortedException("Write was aborted.")));
}
StartShutdown(QUIC_STREAM_SHUTDOWN_FLAGS.ABORT_SEND, errorCode);
@@ -626,13 +648,33 @@ internal override async ValueTask ShutdownCompleted(CancellationToken cancellati
await _state.ShutdownCompletionSource.Task.ConfigureAwait(false);
}
+ internal override ValueTask WaitForWriteCompletionAsync(CancellationToken cancellationToken = default)
+ {
+ // TODO: What should happen if this is called for a unidirectional stream and there are no writes?
+
+ ThrowIfDisposed();
+
+ lock (_state)
+ {
+ if (_state.ShutdownWriteState == ShutdownWriteState.ConnectionClosed)
+ {
+ throw GetConnectionAbortedException(_state);
+ }
+ }
+
+ return new ValueTask(_state.ShutdownWriteCompletionSource.Task.WaitAsync(cancellationToken));
+ }
+
internal override void Shutdown()
{
ThrowIfDisposed();
lock (_state)
{
- _state.SendState = SendState.Finished;
+ if (_state.SendState < SendState.Finished)
+ {
+ _state.SendState = SendState.Finished;
+ }
}
// it is ok to send shutdown several times, MsQuic will ignore it
@@ -855,6 +897,11 @@ private static uint HandleEvent(State state, ref StreamEvent evt)
// Peer has stopped receiving data, don't send anymore.
case QUIC_STREAM_EVENT_TYPE.PEER_RECEIVE_ABORTED:
return HandleEventPeerRecvAborted(state, ref evt);
+ // Occurs when shutdown is completed for the send side.
+ // This only happens for shutdown on sending, not receiving
+ // Receive shutdown can only be abortive.
+ case QUIC_STREAM_EVENT_TYPE.SEND_SHUTDOWN_COMPLETE:
+ return HandleEventSendShutdownComplete(state, ref evt);
// Shutdown for both sending and receiving is completed.
case QUIC_STREAM_EVENT_TYPE.SHUTDOWN_COMPLETE:
return HandleEventShutdownComplete(state, ref evt);
@@ -987,23 +1034,37 @@ private static unsafe uint HandleEventRecv(State state, ref StreamEvent evt)
private static uint HandleEventPeerRecvAborted(State state, ref StreamEvent evt)
{
- bool shouldComplete = false;
+ bool shouldSendComplete = false;
+ bool shouldShutdownWriteComplete = false;
lock (state)
{
if (state.SendState == SendState.None || state.SendState == SendState.Pending)
{
- shouldComplete = true;
+ shouldSendComplete = true;
+ }
+
+ if (state.ShutdownWriteState == ShutdownWriteState.None)
+ {
+ state.ShutdownWriteState = ShutdownWriteState.Canceled;
+ shouldShutdownWriteComplete = true;
}
+
state.SendState = SendState.Aborted;
state.SendErrorCode = (long)evt.Data.PeerReceiveAborted.ErrorCode;
}
- if (shouldComplete)
+ if (shouldSendComplete)
{
state.SendResettableCompletionSource.CompleteException(
ExceptionDispatchInfo.SetCurrentStackTrace(new QuicStreamAbortedException(state.SendErrorCode)));
}
+ if (shouldShutdownWriteComplete)
+ {
+ state.ShutdownWriteCompletionSource.SetException(
+ ExceptionDispatchInfo.SetCurrentStackTrace(new QuicStreamAbortedException(state.SendErrorCode)));
+ }
+
return MsQuicStatusCodes.Success;
}
@@ -1015,6 +1076,38 @@ private static uint HandleEventStartComplete(State state, ref StreamEvent evt)
return MsQuicStatusCodes.Success;
}
+ private static uint HandleEventSendShutdownComplete(State state, ref StreamEvent evt)
+ {
+ // Graceful will be false in three situations:
+ // 1. The peer aborted reads and the PEER_RECEIVE_ABORTED event was raised.
+ // ShutdownWriteCompletionSource is already complete with an error.
+ // 2. We aborted writes.
+ // ShutdownWriteCompletionSource is already complete with an error.
+ // 3. The connection was closed.
+ // SHUTDOWN_COMPLETE event will be raised immediately after this event. It will handle completing with an error.
+ //
+ // Only use this event with sends gracefully completed.
+ if (evt.Data.SendShutdownComplete.Graceful != 0)
+ {
+ bool shouldComplete = false;
+ lock (state)
+ {
+ if (state.ShutdownWriteState == ShutdownWriteState.None)
+ {
+ state.ShutdownWriteState = ShutdownWriteState.Finished;
+ shouldComplete = true;
+ }
+ }
+
+ if (shouldComplete)
+ {
+ state.ShutdownWriteCompletionSource.SetResult();
+ }
+ }
+
+ return MsQuicStatusCodes.Success;
+ }
+
private static uint HandleEventShutdownComplete(State state, ref StreamEvent evt)
{
StreamEventDataShutdownComplete shutdownCompleteEvent = evt.Data.ShutdownComplete;
@@ -1025,6 +1118,7 @@ private static uint HandleEventShutdownComplete(State state, ref StreamEvent evt
}
bool shouldReadComplete = false;
+ bool shouldShutdownWriteComplete = false;
bool shouldShutdownComplete = false;
lock (state)
@@ -1034,6 +1128,15 @@ private static uint HandleEventShutdownComplete(State state, ref StreamEvent evt
shouldReadComplete = CleanupReadStateAndCheckPending(state, ReadState.ReadsCompleted);
+ if (state.ShutdownWriteState == ShutdownWriteState.None)
+ {
+ // TODO: We can get to this point if the stream is unidirectional and there are no writes.
+ // Consider what is the best behavior here with write shutdown and the read side of
+ // unidirecitonal streams in the future.
+ state.ShutdownWriteState = ShutdownWriteState.Finished;
+ shouldShutdownWriteComplete = true;
+ }
+
if (state.ShutdownState == ShutdownState.None)
{
state.ShutdownState = ShutdownState.Finished;
@@ -1046,6 +1149,11 @@ private static uint HandleEventShutdownComplete(State state, ref StreamEvent evt
state.ReceiveResettableCompletionSource.Complete(0);
}
+ if (shouldShutdownWriteComplete)
+ {
+ state.ShutdownWriteCompletionSource.SetResult();
+ }
+
if (shouldShutdownComplete)
{
state.ShutdownCompletionSource.SetResult();
@@ -1157,12 +1265,6 @@ private unsafe ValueTask SendReadOnlyMemoryAsync(
ReadOnlyMemory buffer,
QUIC_SEND_FLAGS flags)
{
- lock (_state)
- {
- Debug.Assert(_state.SendState != SendState.Pending);
- _state.SendState = buffer.IsEmpty ? SendState.Finished : SendState.Pending;
- }
-
if (buffer.IsEmpty)
{
if ((flags & QUIC_SEND_FLAGS.FIN) == QUIC_SEND_FLAGS.FIN)
@@ -1211,13 +1313,6 @@ private unsafe ValueTask SendReadOnlySequenceAsync(
ReadOnlySequence buffers,
QUIC_SEND_FLAGS flags)
{
-
- lock (_state)
- {
- Debug.Assert(_state.SendState != SendState.Pending);
- _state.SendState = buffers.IsEmpty ? SendState.Finished : SendState.Pending;
- }
-
if (buffers.IsEmpty)
{
if ((flags & QUIC_SEND_FLAGS.FIN) == QUIC_SEND_FLAGS.FIN)
@@ -1281,12 +1376,6 @@ private unsafe ValueTask SendReadOnlyMemoryListAsync(
ReadOnlyMemory> buffers,
QUIC_SEND_FLAGS flags)
{
- lock (_state)
- {
- Debug.Assert(_state.SendState != SendState.Pending);
- _state.SendState = buffers.IsEmpty ? SendState.Finished : SendState.Pending;
- }
-
if (buffers.IsEmpty)
{
if ((flags & QUIC_SEND_FLAGS.FIN) == QUIC_SEND_FLAGS.FIN)
@@ -1374,6 +1463,7 @@ private static uint HandleEventConnectionClose(State state)
bool shouldCompleteRead = false;
bool shouldCompleteSend = false;
+ bool shouldCompleteShutdownWrite = false;
bool shouldCompleteShutdown = false;
lock (state)
@@ -1386,6 +1476,12 @@ private static uint HandleEventConnectionClose(State state)
}
state.SendState = SendState.ConnectionClosed;
+ if (state.ShutdownWriteState == ShutdownWriteState.None)
+ {
+ shouldCompleteShutdownWrite = true;
+ }
+ state.ShutdownWriteState = ShutdownWriteState.ConnectionClosed;
+
if (state.ShutdownState == ShutdownState.None)
{
shouldCompleteShutdown = true;
@@ -1405,6 +1501,12 @@ private static uint HandleEventConnectionClose(State state)
ExceptionDispatchInfo.SetCurrentStackTrace(GetConnectionAbortedException(state)));
}
+ if (shouldCompleteShutdownWrite)
+ {
+ state.ShutdownWriteCompletionSource.SetException(
+ ExceptionDispatchInfo.SetCurrentStackTrace(GetConnectionAbortedException(state)));
+ }
+
if (shouldCompleteShutdown)
{
state.ShutdownCompletionSource.SetException(
@@ -1506,6 +1608,14 @@ private enum ReadState
Closed
}
+ private enum ShutdownWriteState
+ {
+ None = 0,
+ Canceled,
+ Finished,
+ ConnectionClosed
+ }
+
private enum ShutdownState
{
None = 0,
diff --git a/src/libraries/System.Net.Quic/src/System/Net/Quic/Implementations/QuicStreamProvider.cs b/src/libraries/System.Net.Quic/src/System/Net/Quic/Implementations/QuicStreamProvider.cs
index 66c9a8b6e51c2d..215ce1304c1a4d 100644
--- a/src/libraries/System.Net.Quic/src/System/Net/Quic/Implementations/QuicStreamProvider.cs
+++ b/src/libraries/System.Net.Quic/src/System/Net/Quic/Implementations/QuicStreamProvider.cs
@@ -47,6 +47,8 @@ internal abstract class QuicStreamProvider : IDisposable, IAsyncDisposable
internal abstract ValueTask ShutdownCompleted(CancellationToken cancellationToken = default);
+ internal abstract ValueTask WaitForWriteCompletionAsync(CancellationToken cancellationToken = default);
+
internal abstract void Shutdown();
internal abstract void Flush();
diff --git a/src/libraries/System.Net.Quic/src/System/Net/Quic/QuicStream.cs b/src/libraries/System.Net.Quic/src/System/Net/Quic/QuicStream.cs
index 8a6dbe496ed4a4..912d32c9ad889c 100644
--- a/src/libraries/System.Net.Quic/src/System/Net/Quic/QuicStream.cs
+++ b/src/libraries/System.Net.Quic/src/System/Net/Quic/QuicStream.cs
@@ -117,6 +117,8 @@ public override int WriteTimeout
public ValueTask ShutdownCompleted(CancellationToken cancellationToken = default) => _provider.ShutdownCompleted(cancellationToken);
+ public ValueTask WaitForWriteCompletionAsync(CancellationToken cancellationToken = default) => _provider.WaitForWriteCompletionAsync(cancellationToken);
+
public void Shutdown() => _provider.Shutdown();
protected override void Dispose(bool disposing)
diff --git a/src/libraries/System.Net.Quic/tests/FunctionalTests/MsQuicTests.cs b/src/libraries/System.Net.Quic/tests/FunctionalTests/MsQuicTests.cs
index 9e3cc64cae132d..809b9a3ba8035a 100644
--- a/src/libraries/System.Net.Quic/tests/FunctionalTests/MsQuicTests.cs
+++ b/src/libraries/System.Net.Quic/tests/FunctionalTests/MsQuicTests.cs
@@ -104,7 +104,6 @@ public async Task ConnectWithCertificateChain()
}
[Fact]
- [PlatformSpecific(TestPlatforms.Windows)]
public async Task UntrustedClientCertificateFails()
{
var listenerOptions = new QuicListenerOptions();
@@ -330,7 +329,6 @@ public async Task ConnectWithCertificateForLoopbackIP_IndicatesExpectedError(str
}
[Theory]
- [PlatformSpecific(TestPlatforms.Windows)]
[InlineData(true)]
// [InlineData(false)] [ActiveIssue("https://github.com/dotnet/runtime/issues/57308")]
public async Task ConnectWithClientCertificate(bool sendCerttificate)
diff --git a/src/libraries/System.Net.Quic/tests/FunctionalTests/QuicStreamTests.cs b/src/libraries/System.Net.Quic/tests/FunctionalTests/QuicStreamTests.cs
index 098bd4d2af1d2f..ed371262c924c2 100644
--- a/src/libraries/System.Net.Quic/tests/FunctionalTests/QuicStreamTests.cs
+++ b/src/libraries/System.Net.Quic/tests/FunctionalTests/QuicStreamTests.cs
@@ -769,6 +769,230 @@ await RunClientServer(
}
);
}
+
+ [Fact]
+ public async Task WaitForWriteCompletionAsync_ClientReadAborted_Throws()
+ {
+ const int ExpectedErrorCode = 0xfffffff;
+
+ TaskCompletionSource waitForAbortTcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
+ SemaphoreSlim sem = new SemaphoreSlim(0);
+
+ await RunBidirectionalClientServer(
+ async clientStream =>
+ {
+ await clientStream.WriteAsync(new byte[1], endStream: true);
+
+ // Wait for server to read data
+ await sem.WaitAsync();
+
+ clientStream.AbortRead(ExpectedErrorCode);
+ },
+ async serverStream =>
+ {
+ var writeCompletionTask = ReleaseOnWriteCompletionAsync();
+
+ int received = await serverStream.ReadAsync(new byte[1]);
+ Assert.Equal(1, received);
+ received = await serverStream.ReadAsync(new byte[1]);
+ Assert.Equal(0, received);
+
+ Assert.False(writeCompletionTask.IsCompleted, "Server is still writing.");
+
+ // Tell client that data has been read and it can abort its reads.
+ sem.Release();
+
+ long sendAbortErrorCode = await waitForAbortTcs.Task;
+ Assert.Equal(ExpectedErrorCode, sendAbortErrorCode);
+
+ await writeCompletionTask;
+
+ async ValueTask ReleaseOnWriteCompletionAsync()
+ {
+ try
+ {
+ await serverStream.WaitForWriteCompletionAsync();
+ waitForAbortTcs.SetException(new Exception("WaitForWriteCompletionAsync didn't throw stream aborted."));
+ }
+ catch (QuicStreamAbortedException ex)
+ {
+ waitForAbortTcs.SetResult(ex.ErrorCode);
+ }
+ catch (Exception ex)
+ {
+ waitForAbortTcs.SetException(ex);
+ }
+ };
+ });
+ }
+
+ [Fact]
+ public async Task WaitForWriteCompletionAsync_ServerWriteAborted_Throws()
+ {
+ const int ExpectedErrorCode = 0xfffffff;
+
+ TaskCompletionSource waitForAbortTcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
+
+ await RunBidirectionalClientServer(
+ async clientStream =>
+ {
+ await clientStream.WriteAsync(new byte[1], endStream: true);
+ },
+ async serverStream =>
+ {
+ var writeCompletionTask = ReleaseOnWriteCompletionAsync();
+
+ int received = await serverStream.ReadAsync(new byte[1]);
+ Assert.Equal(1, received);
+ received = await serverStream.ReadAsync(new byte[1]);
+ Assert.Equal(0, received);
+
+ Assert.False(writeCompletionTask.IsCompleted, "Server is still writing.");
+
+ serverStream.AbortWrite(ExpectedErrorCode);
+
+ await waitForAbortTcs.Task;
+ await writeCompletionTask;
+
+ async ValueTask ReleaseOnWriteCompletionAsync()
+ {
+ try
+ {
+ await serverStream.WaitForWriteCompletionAsync();
+ waitForAbortTcs.SetException(new Exception("WaitForWriteCompletionAsync didn't throw stream aborted."));
+ }
+ catch (QuicOperationAbortedException)
+ {
+ waitForAbortTcs.SetResult();
+ }
+ catch (Exception ex)
+ {
+ waitForAbortTcs.SetException(ex);
+ }
+ };
+ });
+ }
+
+ [Fact]
+ public async Task WaitForWriteCompletionAsync_ServerShutdown_Success()
+ {
+ await RunBidirectionalClientServer(
+ async clientStream =>
+ {
+ await clientStream.WriteAsync(new byte[1], endStream: true);
+
+ int readCount = await clientStream.ReadAsync(new byte[1]);
+ Assert.Equal(1, readCount);
+
+ readCount = await clientStream.ReadAsync(new byte[1]);
+ Assert.Equal(0, readCount);
+ },
+ async serverStream =>
+ {
+ var writeCompletionTask = serverStream.WaitForWriteCompletionAsync();
+
+ int received = await serverStream.ReadAsync(new byte[1]);
+ Assert.Equal(1, received);
+ received = await serverStream.ReadAsync(new byte[1]);
+ Assert.Equal(0, received);
+
+ await serverStream.WriteAsync(new byte[1]);
+
+ Assert.False(writeCompletionTask.IsCompleted, "Server is still writing.");
+
+ serverStream.Shutdown();
+
+ await writeCompletionTask;
+ });
+ }
+
+ [Fact]
+ public async Task WaitForWriteCompletionAsync_GracefulShutdown_Success()
+ {
+ await RunBidirectionalClientServer(
+ async clientStream =>
+ {
+ await clientStream.WriteAsync(new byte[1], endStream: true);
+
+ int readCount = await clientStream.ReadAsync(new byte[1]);
+ Assert.Equal(1, readCount);
+
+ readCount = await clientStream.ReadAsync(new byte[1]);
+ Assert.Equal(0, readCount);
+ },
+ async serverStream =>
+ {
+ var writeCompletionTask = serverStream.WaitForWriteCompletionAsync();
+
+ int received = await serverStream.ReadAsync(new byte[1]);
+ Assert.Equal(1, received);
+ received = await serverStream.ReadAsync(new byte[1]);
+ Assert.Equal(0, received);
+
+ Assert.False(writeCompletionTask.IsCompleted, "Server is still writing.");
+
+ await serverStream.WriteAsync(new byte[1], endStream: true);
+
+ await writeCompletionTask;
+ });
+ }
+
+ [Fact]
+ public async Task WaitForWriteCompletionAsync_ConnectionClosed_Throws()
+ {
+ const int ExpectedErrorCode = 0xfffffff;
+
+ using SemaphoreSlim sem = new SemaphoreSlim(0);
+ TaskCompletionSource waitForAbortTcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
+
+ await RunClientServer(
+ serverFunction: async connection =>
+ {
+ await using QuicStream stream = await connection.AcceptStreamAsync();
+
+ var writeCompletionTask = ReleaseOnWriteCompletionAsync();
+
+ int received = await stream.ReadAsync(new byte[1]);
+ Assert.Equal(1, received);
+ received = await stream.ReadAsync(new byte[1]);
+ Assert.Equal(0, received);
+
+ // Signal that the server has read data
+ sem.Release();
+
+ long closeErrorCode = await waitForAbortTcs.Task;
+ Assert.Equal(ExpectedErrorCode, closeErrorCode);
+
+ await writeCompletionTask;
+
+ async ValueTask ReleaseOnWriteCompletionAsync()
+ {
+ try
+ {
+ await stream.WaitForWriteCompletionAsync();
+ waitForAbortTcs.SetException(new Exception("WaitForWriteCompletionAsync didn't throw connection aborted."));
+ }
+ catch (QuicConnectionAbortedException ex)
+ {
+ waitForAbortTcs.SetResult(ex.ErrorCode);
+ }
+ };
+ },
+ clientFunction: async connection =>
+ {
+ await using QuicStream stream = connection.OpenBidirectionalStream();
+
+ await stream.WriteAsync(new byte[1], endStream: true);
+
+ await stream.WaitForWriteCompletionAsync();
+
+ // Wait for the server to read data before closing the connection
+ await sem.WaitAsync();
+
+ await connection.CloseAsync(ExpectedErrorCode);
+ }
+ );
+ }
}
public sealed class QuicStreamTests_MockProvider : QuicStreamTests
diff --git a/src/libraries/System.Net.Security/src/System/Net/Security/CipherSuitesPolicyPal.Linux.cs b/src/libraries/System.Net.Security/src/System/Net/Security/CipherSuitesPolicyPal.Linux.cs
index 0ddef7980c836f..d59c76ce47228a 100644
--- a/src/libraries/System.Net.Security/src/System/Net/Security/CipherSuitesPolicyPal.Linux.cs
+++ b/src/libraries/System.Net.Security/src/System/Net/Security/CipherSuitesPolicyPal.Linux.cs
@@ -28,7 +28,7 @@ internal sealed class CipherSuitesPolicyPal
internal CipherSuitesPolicyPal(IEnumerable allowedCipherSuites)
{
- if (!Interop.Ssl.Tls13Supported)
+ if (!Interop.Ssl.Capabilities.Tls13Supported)
{
throw new PlatformNotSupportedException(SR.net_ssl_ciphersuites_policy_not_supported);
}
diff --git a/src/libraries/System.Net.Security/src/System/Net/Security/SecureChannel.cs b/src/libraries/System.Net.Security/src/System/Net/Security/SecureChannel.cs
index 10dd32c0316519..adb6680fb999bf 100644
--- a/src/libraries/System.Net.Security/src/System/Net/Security/SecureChannel.cs
+++ b/src/libraries/System.Net.Security/src/System/Net/Security/SecureChannel.cs
@@ -695,11 +695,13 @@ private bool AcquireServerCredentials(ref byte[]? thumbPrint)
_sslAuthenticationOptions.CertificateContext = SslStreamCertificateContext.Create(selectedCert);
}
+ Debug.Assert(_sslAuthenticationOptions.CertificateContext != null);
//
// Note selectedCert is a safe ref possibly cloned from the user passed Cert object
//
byte[] guessedThumbPrint = selectedCert.GetCertHash();
- SafeFreeCredentials? cachedCredentialHandle = SslSessionsCache.TryCachedCredential(guessedThumbPrint, _sslAuthenticationOptions.EnabledSslProtocols, _sslAuthenticationOptions.IsServer, _sslAuthenticationOptions.EncryptionPolicy);
+ bool sendTrustedList = _sslAuthenticationOptions.CertificateContext!.Trust?._sendTrustInHandshake ?? false;
+ SafeFreeCredentials? cachedCredentialHandle = SslSessionsCache.TryCachedCredential(guessedThumbPrint, _sslAuthenticationOptions.EnabledSslProtocols, _sslAuthenticationOptions.IsServer, _sslAuthenticationOptions.EncryptionPolicy, sendTrustedList);
if (cachedCredentialHandle != null)
{
@@ -763,6 +765,7 @@ private SecurityStatusPal GenerateToken(ReadOnlySpan inputBuffer, ref byte
byte[]? result = Array.Empty();
SecurityStatusPal status = default;
bool cachedCreds = false;
+ bool sendTrustList = false;
byte[]? thumbPrint = null;
//
@@ -779,6 +782,11 @@ private SecurityStatusPal GenerateToken(ReadOnlySpan inputBuffer, ref byte
cachedCreds = _sslAuthenticationOptions.IsServer
? AcquireServerCredentials(ref thumbPrint)
: AcquireClientCredentials(ref thumbPrint);
+
+ if (cachedCreds && _sslAuthenticationOptions.IsServer)
+ {
+ sendTrustList = _sslAuthenticationOptions.CertificateContext?.Trust?._sendTrustInHandshake ?? false;
+ }
}
if (_sslAuthenticationOptions.IsServer)
@@ -820,7 +828,7 @@ private SecurityStatusPal GenerateToken(ReadOnlySpan inputBuffer, ref byte
//
if (!cachedCreds && _securityContext != null && !_securityContext.IsInvalid && _credentialsHandle != null && !_credentialsHandle.IsInvalid)
{
- SslSessionsCache.CacheCredential(_credentialsHandle, thumbPrint, _sslAuthenticationOptions.EnabledSslProtocols, _sslAuthenticationOptions.IsServer, _sslAuthenticationOptions.EncryptionPolicy);
+ SslSessionsCache.CacheCredential(_credentialsHandle, thumbPrint, _sslAuthenticationOptions.EnabledSslProtocols, _sslAuthenticationOptions.IsServer, _sslAuthenticationOptions.EncryptionPolicy, sendTrustList);
}
}
}
diff --git a/src/libraries/System.Net.Security/src/System/Net/Security/SslSessionsCache.cs b/src/libraries/System.Net.Security/src/System/Net/Security/SslSessionsCache.cs
index 13e4f772f6b3b9..35eb4ec534b83d 100644
--- a/src/libraries/System.Net.Security/src/System/Net/Security/SslSessionsCache.cs
+++ b/src/libraries/System.Net.Security/src/System/Net/Security/SslSessionsCache.cs
@@ -25,18 +25,20 @@ internal static class SslSessionsCache
private readonly int _allowedProtocols;
private readonly EncryptionPolicy _encryptionPolicy;
private readonly bool _isServerMode;
+ private readonly bool _sendTrustList;
//
// SECURITY: X509Certificate.GetCertHash() is virtual hence before going here,
// the caller of this ctor has to ensure that a user cert object was inspected and
// optionally cloned.
//
- internal SslCredKey(byte[]? thumbPrint, int allowedProtocols, bool isServerMode, EncryptionPolicy encryptionPolicy)
+ internal SslCredKey(byte[]? thumbPrint, int allowedProtocols, bool isServerMode, EncryptionPolicy encryptionPolicy, bool sendTrustList)
{
_thumbPrint = thumbPrint ?? Array.Empty();
_allowedProtocols = allowedProtocols;
_encryptionPolicy = encryptionPolicy;
_isServerMode = isServerMode;
+ _sendTrustList = sendTrustList;
}
public override int GetHashCode()
@@ -65,6 +67,7 @@ public override int GetHashCode()
hashCode ^= _allowedProtocols;
hashCode ^= (int)_encryptionPolicy;
hashCode ^= _isServerMode ? 0x10000 : 0x20000;
+ hashCode ^= _sendTrustList ? 0x40000 : 0x80000;
return hashCode;
}
@@ -96,6 +99,11 @@ public bool Equals(SslCredKey other)
return false;
}
+ if (_sendTrustList != other._sendTrustList)
+ {
+ return false;
+ }
+
for (int i = 0; i < thumbPrint.Length; ++i)
{
if (thumbPrint[i] != otherThumbPrint[i])
@@ -114,7 +122,7 @@ public bool Equals(SslCredKey other)
// ATTN: The returned handle can be invalid, the callers of InitializeSecurityContext and AcceptSecurityContext
// must be prepared to execute a back-out code if the call fails.
//
- internal static SafeFreeCredentials? TryCachedCredential(byte[]? thumbPrint, SslProtocols sslProtocols, bool isServer, EncryptionPolicy encryptionPolicy)
+ internal static SafeFreeCredentials? TryCachedCredential(byte[]? thumbPrint, SslProtocols sslProtocols, bool isServer, EncryptionPolicy encryptionPolicy, bool sendTrustList = false)
{
if (s_cachedCreds.IsEmpty)
{
@@ -122,7 +130,7 @@ public bool Equals(SslCredKey other)
return null;
}
- var key = new SslCredKey(thumbPrint, (int)sslProtocols, isServer, encryptionPolicy);
+ var key = new SslCredKey(thumbPrint, (int)sslProtocols, isServer, encryptionPolicy, sendTrustList);
//SafeCredentialReference? cached;
SafeFreeCredentials? credentials = GetCachedCredential(key);
@@ -147,7 +155,7 @@ public bool Equals(SslCredKey other)
//
// ATTN: The thumbPrint must be from inspected and possibly cloned user Cert object or we get a security hole in SslCredKey ctor.
//
- internal static void CacheCredential(SafeFreeCredentials creds, byte[]? thumbPrint, SslProtocols sslProtocols, bool isServer, EncryptionPolicy encryptionPolicy)
+ internal static void CacheCredential(SafeFreeCredentials creds, byte[]? thumbPrint, SslProtocols sslProtocols, bool isServer, EncryptionPolicy encryptionPolicy, bool sendTrustList = false)
{
Debug.Assert(creds != null, "creds == null");
@@ -157,7 +165,7 @@ internal static void CacheCredential(SafeFreeCredentials creds, byte[]? thumbPri
return;
}
- SslCredKey key = new SslCredKey(thumbPrint, (int)sslProtocols, isServer, encryptionPolicy);
+ SslCredKey key = new SslCredKey(thumbPrint, (int)sslProtocols, isServer, encryptionPolicy, sendTrustList);
SafeFreeCredentials? credentials = GetCachedCredential(key);
diff --git a/src/libraries/System.Net.Security/src/System/Net/Security/SslStreamPal.Windows.cs b/src/libraries/System.Net.Security/src/System/Net/Security/SslStreamPal.Windows.cs
index 29ab3bed0ee8c6..1824e9b0233123 100644
--- a/src/libraries/System.Net.Security/src/System/Net/Security/SslStreamPal.Windows.cs
+++ b/src/libraries/System.Net.Security/src/System/Net/Security/SslStreamPal.Windows.cs
@@ -124,8 +124,8 @@ public static SafeFreeCredentials AcquireCredentialsHandle(SslStreamCertificateC
{
// New crypto API supports TLS1.3 but it does not allow to force NULL encryption.
SafeFreeCredentials cred = !UseNewCryptoApi || policy == EncryptionPolicy.NoEncryption ?
- AcquireCredentialsHandleSchannelCred(certificateContext?.Certificate, protocols, policy, isServer) :
- AcquireCredentialsHandleSchCredentials(certificateContext?.Certificate, protocols, policy, isServer);
+ AcquireCredentialsHandleSchannelCred(certificateContext, protocols, policy, isServer) :
+ AcquireCredentialsHandleSchCredentials(certificateContext, protocols, policy, isServer);
if (certificateContext != null && certificateContext.Trust != null && certificateContext.Trust._sendTrustInHandshake)
{
AttachCertificateStore(cred, certificateContext.Trust._store!);
@@ -157,8 +157,9 @@ private static unsafe void AttachCertificateStore(SafeFreeCredentials cred, X509
// This is legacy crypto API used on .NET Framework and older Windows versions.
// It only supports TLS up to 1.2
- public static unsafe SafeFreeCredentials AcquireCredentialsHandleSchannelCred(X509Certificate2? certificate, SslProtocols protocols, EncryptionPolicy policy, bool isServer)
+ public static unsafe SafeFreeCredentials AcquireCredentialsHandleSchannelCred(SslStreamCertificateContext? certificateContext, SslProtocols protocols, EncryptionPolicy policy, bool isServer)
{
+ X509Certificate2? certificate = certificateContext?.Certificate;
int protocolFlags = GetProtocolFlagsFromSslProtocols(protocols, isServer);
Interop.SspiCli.SCHANNEL_CRED.Flags flags;
Interop.SspiCli.CredentialUse direction;
@@ -183,6 +184,10 @@ public static unsafe SafeFreeCredentials AcquireCredentialsHandleSchannelCred(X5
{
direction = Interop.SspiCli.CredentialUse.SECPKG_CRED_INBOUND;
flags = Interop.SspiCli.SCHANNEL_CRED.Flags.SCH_SEND_AUX_RECORD;
+ if (certificateContext?.Trust?._sendTrustInHandshake == true)
+ {
+ flags |= Interop.SspiCli.SCHANNEL_CRED.Flags.SCH_CRED_NO_SYSTEM_MAPPER;
+ }
}
if (NetEventSource.Log.IsEnabled()) NetEventSource.Info($"flags=({flags}), ProtocolFlags=({protocolFlags}), EncryptionPolicy={policy}");
@@ -203,8 +208,9 @@ public static unsafe SafeFreeCredentials AcquireCredentialsHandleSchannelCred(X5
}
// This function uses new crypto API to support TLS 1.3 and beyond.
- public static unsafe SafeFreeCredentials AcquireCredentialsHandleSchCredentials(X509Certificate2? certificate, SslProtocols protocols, EncryptionPolicy policy, bool isServer)
+ public static unsafe SafeFreeCredentials AcquireCredentialsHandleSchCredentials(SslStreamCertificateContext? certificateContext, SslProtocols protocols, EncryptionPolicy policy, bool isServer)
{
+ X509Certificate2? certificate = certificateContext?.Certificate;
int protocolFlags = GetProtocolFlagsFromSslProtocols(protocols, isServer);
Interop.SspiCli.SCH_CREDENTIALS.Flags flags;
Interop.SspiCli.CredentialUse direction;
@@ -212,6 +218,10 @@ public static unsafe SafeFreeCredentials AcquireCredentialsHandleSchCredentials(
{
direction = Interop.SspiCli.CredentialUse.SECPKG_CRED_INBOUND;
flags = Interop.SspiCli.SCH_CREDENTIALS.Flags.SCH_SEND_AUX_RECORD;
+ if (certificateContext?.Trust?._sendTrustInHandshake == true)
+ {
+ flags |= Interop.SspiCli.SCH_CREDENTIALS.Flags.SCH_CRED_NO_SYSTEM_MAPPER;
+ }
}
else
{
diff --git a/src/libraries/System.Net.Security/tests/FunctionalTests/LoggingTest.cs b/src/libraries/System.Net.Security/tests/FunctionalTests/LoggingTest.cs
index 60320d78a0ce2e..1b99f0cd4d85ae 100644
--- a/src/libraries/System.Net.Security/tests/FunctionalTests/LoggingTest.cs
+++ b/src/libraries/System.Net.Security/tests/FunctionalTests/LoggingTest.cs
@@ -5,6 +5,7 @@
using System.Diagnostics;
using System.Diagnostics.Tracing;
using Microsoft.DotNet.RemoteExecutor;
+using Microsoft.DotNet.XUnitExtensions;
using Xunit;
namespace System.Net.Security.Tests
@@ -26,6 +27,12 @@ public void EventSource_ExistsWithCorrectId()
[ConditionalFact(typeof(RemoteExecutor), nameof(RemoteExecutor.IsSupported))]
public void EventSource_EventsRaisedAsExpected()
{
+ if (PlatformDetection.IsWindows10Version22000OrGreater)
+ {
+ // [ActiveIssue("https://github.com/dotnet/runtime/issues/58927")]
+ throw new SkipTestException("Unstable on Windows 11");
+ }
+
RemoteExecutor.Invoke(() =>
{
using (var listener = new TestEventListener("Private.InternalDiagnostics.System.Net.Security", EventLevel.Verbose))
diff --git a/src/libraries/System.Net.Security/tests/FunctionalTests/SslStreamNetworkStreamTest.cs b/src/libraries/System.Net.Security/tests/FunctionalTests/SslStreamNetworkStreamTest.cs
index 3428ba78845d48..285b6f1ff87952 100644
--- a/src/libraries/System.Net.Security/tests/FunctionalTests/SslStreamNetworkStreamTest.cs
+++ b/src/libraries/System.Net.Security/tests/FunctionalTests/SslStreamNetworkStreamTest.cs
@@ -413,6 +413,12 @@ await Assert.ThrowsAsync(()=>
[PlatformSpecific(TestPlatforms.Windows)]
public async Task SslStream_NegotiateClientCertificateAsyncTls13_Succeeds(bool sendClientCertificate)
{
+ if (PlatformDetection.IsWindows10Version22000OrGreater)
+ {
+ // [ActiveIssue("https://github.com/dotnet/runtime/issues/58927")]
+ throw new SkipTestException("Unstable on Windows 11");
+ }
+
bool negotiateClientCertificateCalled = false;
using CancellationTokenSource cts = new CancellationTokenSource();
cts.CancelAfter(TestConfiguration.PassingTestTimeout);
diff --git a/src/libraries/System.Net.Security/tests/FunctionalTests/SslStreamStreamToStreamTest.cs b/src/libraries/System.Net.Security/tests/FunctionalTests/SslStreamStreamToStreamTest.cs
index 3ecfbc4e92493f..b05fbc6f53bc44 100644
--- a/src/libraries/System.Net.Security/tests/FunctionalTests/SslStreamStreamToStreamTest.cs
+++ b/src/libraries/System.Net.Security/tests/FunctionalTests/SslStreamStreamToStreamTest.cs
@@ -11,6 +11,7 @@
using System.Text;
using System.Threading;
using System.Threading.Tasks;
+using Microsoft.DotNet.XUnitExtensions;
using Xunit;
namespace System.Net.Security.Tests
@@ -66,11 +67,18 @@ public static IEnumerable SslStream_StreamToStream_Authentication_Succ
}
}
- [Theory]
+ [ConditionalTheory]
[MemberData(nameof(SslStream_StreamToStream_Authentication_Success_MemberData))]
[SkipOnPlatform(TestPlatforms.iOS | TestPlatforms.tvOS, "X509 certificate store is not supported on iOS or tvOS.")]
public async Task SslStream_StreamToStream_Authentication_Success(X509Certificate serverCert = null, X509Certificate clientCert = null)
{
+
+ if (PlatformDetection.IsWindows10Version22000OrGreater)
+ {
+ // [ActiveIssue("https://github.com/dotnet/runtime/issues/58927")]
+ throw new SkipTestException("Unstable on Windows 11");
+ }
+
(Stream stream1, Stream stream2) = TestHelper.GetConnectedStreams();
using (var client = new SslStream(stream1, false, AllowAnyServerCertificate))
using (var server = new SslStream(stream2, false, delegate { return true; }))
diff --git a/src/libraries/System.Net.Security/tests/FunctionalTests/SslStreamSystemDefaultsTest.cs b/src/libraries/System.Net.Security/tests/FunctionalTests/SslStreamSystemDefaultsTest.cs
index 5380b4027a6f76..8e6b2176f62cbc 100644
--- a/src/libraries/System.Net.Security/tests/FunctionalTests/SslStreamSystemDefaultsTest.cs
+++ b/src/libraries/System.Net.Security/tests/FunctionalTests/SslStreamSystemDefaultsTest.cs
@@ -8,7 +8,7 @@
using System.Security.Cryptography.X509Certificates;
using System.Security.Authentication;
using System.Threading.Tasks;
-
+using Microsoft.DotNet.XUnitExtensions;
using Xunit;
namespace System.Net.Security.Tests
@@ -76,6 +76,12 @@ public static IEnumerable OneOrBothUseDefaulData()
[MemberData(nameof(OneOrBothUseDefaulData))]
public async Task ClientAndServer_OneOrBothUseDefault_Ok(SslProtocols? clientProtocols, SslProtocols? serverProtocols)
{
+ if (PlatformDetection.IsWindows10Version22000OrGreater)
+ {
+ // [ActiveIssue("https://github.com/dotnet/runtime/issues/58927")]
+ throw new SkipTestException("Unstable on Windows 11");
+ }
+
using (X509Certificate2 serverCertificate = Configuration.Certificates.GetServerCertificate())
using (X509Certificate2 clientCertificate = Configuration.Certificates.GetClientCertificate())
{
diff --git a/src/libraries/System.Net.Sockets/tests/FunctionalTests/DnsEndPointTest.cs b/src/libraries/System.Net.Sockets/tests/FunctionalTests/DnsEndPointTest.cs
index 1e362a04819c0f..f23a1e835b7be3 100644
--- a/src/libraries/System.Net.Sockets/tests/FunctionalTests/DnsEndPointTest.cs
+++ b/src/libraries/System.Net.Sockets/tests/FunctionalTests/DnsEndPointTest.cs
@@ -272,7 +272,7 @@ public void Socket_ConnectAsyncDnsEndPoint_HostNotFound()
bool willRaiseEvent = sock.ConnectAsync(args);
if (willRaiseEvent)
{
- Assert.True(complete.WaitOne(TestSettings.PassingTestTimeout), "Timed out while waiting for connection");
+ Assert.True(complete.WaitOne(TestSettings.PassingTestLongTimeout), "Timed out while waiting for connection");
complete.Dispose(); // only dispose on success as we know we're done with the instance
}
@@ -332,7 +332,7 @@ public void Socket_StaticConnectAsync_Success(SocketImplementationType type)
if (Socket.ConnectAsync(SocketType.Stream, ProtocolType.Tcp, args))
{
- Assert.True(complete.WaitOne(TestSettings.PassingTestTimeout), "Timed out while waiting for connection");
+ Assert.True(complete.WaitOne(TestSettings.PassingTestLongTimeout), "Timed out while waiting for connection");
}
Assert.Equal(SocketError.Success, args.SocketError);
@@ -348,7 +348,7 @@ public void Socket_StaticConnectAsync_Success(SocketImplementationType type)
if (Socket.ConnectAsync(SocketType.Stream, ProtocolType.Tcp, args))
{
- Assert.True(complete.WaitOne(TestSettings.PassingTestTimeout), "Timed out while waiting for connection");
+ Assert.True(complete.WaitOne(TestSettings.PassingTestLongTimeout), "Timed out while waiting for connection");
}
complete.Dispose(); // only dispose on success as we know we're done with the instance
@@ -404,7 +404,7 @@ public void Socket_StaticConnectAsync_HostNotFound()
OnConnectAsyncCompleted(null, args);
}
- Assert.True(complete.WaitOne(TestSettings.PassingTestTimeout), "Timed out while waiting for connection");
+ Assert.True(complete.WaitOne(TestSettings.PassingTestLongTimeout), "Timed out while waiting for connection");
complete.Dispose(); // only dispose on success as we know we're done with the instance
AssertHostNotFoundOrNoData(args);
diff --git a/src/libraries/System.Net.Sockets/tests/FunctionalTests/SendFile.cs b/src/libraries/System.Net.Sockets/tests/FunctionalTests/SendFile.cs
index cda5d75b48c303..aa0d967e9f783d 100644
--- a/src/libraries/System.Net.Sockets/tests/FunctionalTests/SendFile.cs
+++ b/src/libraries/System.Net.Sockets/tests/FunctionalTests/SendFile.cs
@@ -235,45 +235,6 @@ public async Task SliceBuffers_Success()
}
}
- [ActiveIssue("https://github.com/dotnet/runtime/issues/42534", TestPlatforms.Windows)]
- [OuterLoop("Creates and sends a file several gigabytes long")]
- [Fact]
- public async Task GreaterThan2GBFile_SendsAllBytes()
- {
- const long FileLength = 100L + int.MaxValue;
-
- using var tmpFile = TempFile.Create();
- using (FileStream fs = File.Create(tmpFile.Path))
- {
- fs.SetLength(FileLength);
- }
-
- using var client = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);
- using var listener = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);
- listener.BindToAnonymousPort(IPAddress.Loopback);
- listener.Listen(1);
-
- client.Connect(listener.LocalEndPoint);
- using Socket server = listener.Accept();
-
- await new Task[]
- {
- SendFileAsync(server, tmpFile.Path),
- Task.Run(() =>
- {
- byte[] buffer = new byte[100_000];
- long count = 0;
- while (count < FileLength)
- {
- int received = client.Receive(buffer);
- Assert.NotEqual(0, received);
- count += received;
- }
- Assert.Equal(0, client.Available);
- })
- }.WhenAllOrAnyFailed();
- }
-
[Fact]
public async Task SendFileGetsCanceledByDispose()
{
@@ -503,4 +464,78 @@ public void EndSendFile_NullAsyncResult_Throws()
Assert.Throws(() => s.EndSendFile(null));
}
}
+
+ // Running all cases of GreaterThan2GBFile_SendsAllBytes in parallel may attempt to allocate Min(ProcessorCount, Subclass_Count) * 2GB of disk space
+ // in extreme cases. Some CI machines may run out of disk space if this happens.
+ [Collection(nameof(NoParallelTests))]
+ public abstract class SendFile_NonParallel : SocketTestHelperBase where T : SocketHelperBase, new()
+ {
+ protected SendFile_NonParallel(ITestOutputHelper output) : base(output)
+ {
+ }
+
+ [ActiveIssue("https://github.com/dotnet/runtime/issues/42534", TestPlatforms.Windows)]
+ [OuterLoop("Creates and sends a file several gigabytes long")]
+ [Fact]
+ public async Task GreaterThan2GBFile_SendsAllBytes()
+ {
+ const long FileLength = 100L + int.MaxValue;
+
+ using var tmpFile = TempFile.Create();
+ using (FileStream fs = File.Create(tmpFile.Path))
+ {
+ fs.SetLength(FileLength);
+ }
+
+ using var client = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);
+ using var listener = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);
+ listener.BindToAnonymousPort(IPAddress.Loopback);
+ listener.Listen(1);
+
+ client.Connect(listener.LocalEndPoint);
+ using Socket server = listener.Accept();
+
+ await new Task[]
+ {
+ SendFileAsync(server, tmpFile.Path),
+ Task.Run(() =>
+ {
+ byte[] buffer = new byte[100_000];
+ long count = 0;
+ while (count < FileLength)
+ {
+ int received = client.Receive(buffer);
+ Assert.NotEqual(0, received);
+ count += received;
+ }
+ Assert.Equal(0, client.Available);
+ })
+ }.WhenAllOrAnyFailed();
+ }
+ }
+
+ public sealed class SendFile_NonParallel_SyncSpan : SendFile_NonParallel
+ {
+ public SendFile_NonParallel_SyncSpan(ITestOutputHelper output) : base(output) { }
+ }
+
+ public sealed class SendFile_NonParallel_SyncSpanForceNonBlocking : SendFile_NonParallel
+ {
+ public SendFile_NonParallel_SyncSpanForceNonBlocking(ITestOutputHelper output) : base(output) { }
+ }
+
+ public sealed class SendFile_NonParallel_ArraySync : SendFile_NonParallel
+ {
+ public SendFile_NonParallel_ArraySync(ITestOutputHelper output) : base(output) { }
+ }
+
+ public sealed class SendFile_NonParallel_Task : SendFile_NonParallel
+ {
+ public SendFile_NonParallel_Task(ITestOutputHelper output) : base(output) { }
+ }
+
+ public sealed class SendFile_NonParallel_Apm : SendFile_NonParallel
+ {
+ public SendFile_NonParallel_Apm(ITestOutputHelper output) : base(output) { }
+ }
}
diff --git a/src/libraries/System.Net.Sockets/tests/FunctionalTests/SendPacketsAsync.cs b/src/libraries/System.Net.Sockets/tests/FunctionalTests/SendPacketsAsync.cs
index 29c24352c1a76c..10ebc472f93be2 100644
--- a/src/libraries/System.Net.Sockets/tests/FunctionalTests/SendPacketsAsync.cs
+++ b/src/libraries/System.Net.Sockets/tests/FunctionalTests/SendPacketsAsync.cs
@@ -6,11 +6,14 @@
using System.Net.Test.Common;
using System.Threading;
+using Microsoft.DotNet.XUnitExtensions;
+
using Xunit;
using Xunit.Abstractions;
namespace System.Net.Sockets.Tests
{
+ [Collection(nameof(NoParallelTests))]
public class SendPacketsAsync
{
private readonly ITestOutputHelper _log;
@@ -525,7 +528,10 @@ public void SendPacketsElement_FileStreamMultiPart_Success()
}
}
- [Fact]
+ public static bool IsNotWindows11 = !PlatformDetection.IsWindows10Version22000OrGreater;
+
+ [ActiveIssue("https://github.com/dotnet/runtime/issues/58898")]
+ [ConditionalFact(nameof(IsNotWindows11))]
public void SendPacketsElement_FileStreamLargeOffset_Throws()
{
using (var stream = new FileStream(TestFileName, FileMode.Open, FileAccess.Read, FileShare.Read, 4096, useAsync: true))
@@ -548,7 +554,8 @@ public void SendPacketsElement_FileStreamLargeCount_Throws()
}
}
- [Fact]
+ [ActiveIssue("https://github.com/dotnet/runtime/issues/58898")]
+ [ConditionalFact(nameof(IsNotWindows11))]
public void SendPacketsElement_FileStreamWithOptions_Success() {
using (var stream = new FileStream(TestFileName, FileMode.Open, FileAccess.Read, FileShare.ReadWrite, 4096, FileOptions.Asynchronous | FileOptions.SequentialScan)) {
var element = new SendPacketsElement(stream, 0, s_testFileSize);
@@ -579,7 +586,8 @@ public void SendPacketsElement_FileStreamMultiPartMixed_Success() {
}
}
- [Fact]
+ [ActiveIssue("https://github.com/dotnet/runtime/issues/58898")]
+ [ConditionalFact(nameof(IsNotWindows11))]
public void SendPacketsElement_FileStreamMultiPartMixed_MultipleFileStreams_Success() {
using (var stream = new FileStream(TestFileName, FileMode.Open, FileAccess.Read, FileShare.Read, 4096, FileOptions.Asynchronous))
using (var stream2 = new FileStream(TestFileName, FileMode.Open, FileAccess.Read, FileShare.Read, 4096, FileOptions.Asynchronous)) {
diff --git a/src/libraries/System.Net.WebSockets.Client/System.Net.WebSockets.Client.sln b/src/libraries/System.Net.WebSockets.Client/System.Net.WebSockets.Client.sln
index 6c64c7da37d5f8..a0efb293da7af1 100644
--- a/src/libraries/System.Net.WebSockets.Client/System.Net.WebSockets.Client.sln
+++ b/src/libraries/System.Net.WebSockets.Client/System.Net.WebSockets.Client.sln
@@ -19,6 +19,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{A0314AC5-E49
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{6F9A42A0-A04B-4CD0-B8C9-9A728274C851}"
EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.WebSockets.Client.Wasm.Tests", "tests\wasm\System.Net.WebSockets.Client.Wasm.Tests.csproj", "{CA20532A-33B3-4DC0-92D2-EA6D7987D59F}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -53,6 +55,10 @@ Global
{6B9721B2-00D0-41EC-96B9-6428CF1830CF}.Debug|Any CPU.Build.0 = Debug|Any CPU
{6B9721B2-00D0-41EC-96B9-6428CF1830CF}.Release|Any CPU.ActiveCfg = Release|Any CPU
{6B9721B2-00D0-41EC-96B9-6428CF1830CF}.Release|Any CPU.Build.0 = Release|Any CPU
+ {CA20532A-33B3-4DC0-92D2-EA6D7987D59F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {CA20532A-33B3-4DC0-92D2-EA6D7987D59F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {CA20532A-33B3-4DC0-92D2-EA6D7987D59F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {CA20532A-33B3-4DC0-92D2-EA6D7987D59F}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -65,6 +71,7 @@ Global
{0CD4C24D-7746-46F0-8D47-A396882B5468} = {6F9A42A0-A04B-4CD0-B8C9-9A728274C851}
{8CD4D190-F656-4970-9AE9-4A9F8B30A2F8} = {6F9A42A0-A04B-4CD0-B8C9-9A728274C851}
{59A23CAB-D098-495F-A467-74C7553FF5BB} = {6F9A42A0-A04B-4CD0-B8C9-9A728274C851}
+ {CA20532A-33B3-4DC0-92D2-EA6D7987D59F} = {BEE2F256-0489-4809-AB20-27ADB2D0E10C}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {D91D7DC5-24CC-4716-A357-8170C4EB1C32}
diff --git a/src/libraries/System.Net.WebSockets.Client/tests/SendReceiveTest.cs b/src/libraries/System.Net.WebSockets.Client/tests/SendReceiveTest.cs
index f5d86dfff25ba8..b8b4159e2db52d 100644
--- a/src/libraries/System.Net.WebSockets.Client/tests/SendReceiveTest.cs
+++ b/src/libraries/System.Net.WebSockets.Client/tests/SendReceiveTest.cs
@@ -255,12 +255,12 @@ await SendAsync(
"ReceiveAsync"),
ex.Message);
- Assert.Equal(WebSocketState.Aborted, cws.State);
+ Assert.True(WebSocketState.Aborted == cws.State, cws.State+" state when InvalidOperationException");
}
else if (ex is WebSocketException)
{
// Multiple cases.
- Assert.Equal(WebSocketState.Aborted, cws.State);
+ Assert.True(WebSocketState.Aborted == cws.State, cws.State + " state when WebSocketException");
WebSocketError errCode = (ex as WebSocketException).WebSocketErrorCode;
Assert.True(
@@ -269,7 +269,7 @@ await SendAsync(
}
else if (ex is OperationCanceledException)
{
- Assert.Equal(WebSocketState.Aborted, cws.State);
+ Assert.True(WebSocketState.Aborted == cws.State, cws.State + " state when OperationCanceledException");
}
else
{
diff --git a/src/libraries/System.Net.WebSockets.Client/tests/wasm/BrowserTimerThrottlingTest.cs b/src/libraries/System.Net.WebSockets.Client/tests/wasm/BrowserTimerThrottlingTest.cs
new file mode 100644
index 00000000000000..df6e5f17705909
--- /dev/null
+++ b/src/libraries/System.Net.WebSockets.Client/tests/wasm/BrowserTimerThrottlingTest.cs
@@ -0,0 +1,181 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Collections.Generic;
+using System.Linq;
+using System.Net.WebSockets.Client.Tests;
+using System.Runtime.InteropServices;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+
+using Xunit;
+using Xunit.Abstractions;
+using Xunit.Sdk;
+
+namespace System.Net.WebSockets.Client.Wasm.Tests
+{
+ // https://developer.chrome.com/blog/timer-throttling-in-chrome-88/
+ // https://docs.google.com/document/d/11FhKHRcABGS4SWPFGwoL6g0ALMqrFKapCk5ZTKKupEk/view
+ // requires chromium based browser
+ // requires minimized browser or browser tab out of focus, browser can't be headless
+ // requires --enable-features=IntensiveWakeUpThrottling:grace_period_seconds/1 chromeDriver flags
+ // doesn't work with --disable-background-timer-throttling
+ [TestCaseOrderer("System.Net.WebSockets.Client.Wasm.Tests.AlphabeticalOrderer", "System.Net.WebSockets.Client.Wasm.Tests")]
+ public class BrowserTimerThrottlingTest : ClientWebSocketTestBase
+ {
+ public static bool IsBrowser => RuntimeInformation.IsOSPlatform(OSPlatform.Create("BROWSER"));
+ const double moreThanLightThrottlingThreshold = 1900;
+ const double detectLightThrottlingThreshold = 900;
+ const double webSocketMessageFrequency = 45000;
+ const double fastTimeoutFrequency = 100;
+
+ public BrowserTimerThrottlingTest(ITestOutputHelper output) : base(output) { }
+
+ [ConditionalFact(nameof(PlatformDetection.IsBrowser))]
+ [OuterLoop] // involves long delay
+ // this test is influenced by usage of WS on the same browser tab in previous unit tests. we may need to wait long time for it to fizzle down
+ public async Task DotnetTimersAreHeavilyThrottledWithoutWebSocket()
+ {
+ double maxDelayMs = 0;
+ double maxLightDelayMs = 0;
+ DateTime start = DateTime.Now;
+ CancellationTokenSource cts = new CancellationTokenSource();
+
+ using (var timer = new Timers.Timer(fastTimeoutFrequency))
+ {
+ DateTime last = DateTime.Now;
+ timer.AutoReset = true;
+ timer.Enabled = true;
+ timer.Elapsed += (object? source, Timers.ElapsedEventArgs? e) =>
+ {
+ var ms = (e.SignalTime - last).TotalMilliseconds;
+ if (maxDelayMs < ms)
+ {
+ maxDelayMs = ms;
+ }
+ if (ms > moreThanLightThrottlingThreshold)
+ {
+#if DEBUG
+ Console.WriteLine("Too slow tick " + ms);
+#endif
+ // stop, we are throttled heavily, this is what we are looking for
+ cts.Cancel();
+ }
+ else if (ms > detectLightThrottlingThreshold)
+ {
+ maxLightDelayMs = ms;
+ // we are lightly throttled
+#if DEBUG
+ Console.WriteLine("Slow tick NO-WS " + ms);
+#endif
+ }
+ last = e.SignalTime;
+ };
+
+ // test it for 10 minutes
+ try { await Task.Delay(10 * 60 * 1000, cts.Token); } catch (Exception) { }
+ timer.Close();
+ }
+ Assert.True(maxDelayMs > detectLightThrottlingThreshold, "Expect that it throttled lightly " + maxDelayMs);
+ Assert.True(maxDelayMs > moreThanLightThrottlingThreshold, "Expect that it was heavily throttled " + maxDelayMs);
+ }
+
+ [ConditionalFact(nameof(WebSocketsSupported), nameof(PlatformDetection.IsBrowser))]
+ [OuterLoop] // involves long delay
+ public async Task WebSocketKeepsDotnetTimersOnlyLightlyThrottled()
+ {
+ double maxDelayMs = 0;
+ double maxLightDelayMs = 0;
+ DateTime start = DateTime.Now;
+ CancellationTokenSource cts = new CancellationTokenSource();
+
+ using (ClientWebSocket cws = await WebSocketHelper.GetConnectedWebSocket(Test.Common.Configuration.WebSockets.RemoteEchoServer, TimeOutMilliseconds, _output))
+ {
+ await SendAndReceive(cws, "test");
+ using (var timer = new Timers.Timer(fastTimeoutFrequency))
+ {
+ DateTime last = DateTime.Now;
+ DateTime lastSent = DateTime.MinValue;
+ timer.AutoReset = true;
+ timer.Enabled = true;
+ timer.Elapsed += async (object? source, Timers.ElapsedEventArgs? e) =>
+ {
+ var ms = (e.SignalTime - last).TotalMilliseconds;
+ var msSent = (e.SignalTime - lastSent).TotalMilliseconds;
+ if (maxDelayMs < ms)
+ {
+ maxDelayMs = ms;
+ }
+ if (ms > moreThanLightThrottlingThreshold)
+ {
+ // fail fast, we are throttled heavily
+#if DEBUG
+ Console.WriteLine("Too slow tick " + ms);
+#endif
+ cts.Cancel();
+ }
+ else if (ms > detectLightThrottlingThreshold)
+ {
+ maxLightDelayMs = ms;
+ // we are lightly throttled
+#if DEBUG
+ Console.WriteLine("Slow tick WS " + ms);
+#endif
+ }
+ if (msSent > webSocketMessageFrequency)
+ {
+ await SendAndReceive(cws, "test");
+ lastSent = DateTime.Now;
+ }
+ last = e.SignalTime;
+ };
+
+ // test it for 10 minutes
+ try { await Task.Delay(10 * 60 * 1000, cts.Token); } catch (Exception) { }
+ timer.Close();
+ }
+ await cws.CloseAsync(WebSocketCloseStatus.NormalClosure, "WebSocketKeepsDotnetTimersOnlyLightlyThrottled", CancellationToken.None);
+ }
+ Assert.True(maxDelayMs > detectLightThrottlingThreshold, "Expect that it throttled lightly " + maxDelayMs);
+ Assert.True(maxDelayMs < moreThanLightThrottlingThreshold, "Expect that it wasn't heavily throttled " + maxDelayMs);
+ }
+
+ private async static Task SendAndReceive(ClientWebSocket cws, string message)
+ {
+ try
+ {
+ byte[] buffer = Encoding.UTF8.GetBytes(message);
+ await cws.SendAsync(new ArraySegment(buffer), WebSocketMessageType.Text, true, CancellationToken.None);
+
+ var receiveBuffer = new byte[100];
+ var receiveSegment = new ArraySegment(receiveBuffer);
+ WebSocketReceiveResult recvRet = await cws.ReceiveAsync(receiveSegment, CancellationToken.None);
+#if DEBUG
+ Console.WriteLine("SendAndReceive");
+#endif
+ }
+ catch (OperationCanceledException)
+ {
+ }
+ catch (Exception ex)
+ {
+#if DEBUG
+ Console.WriteLine("SendAndReceive fail:" + ex);
+#endif
+ }
+ }
+ }
+
+ // this is just for convinience, as the second test has side-effect to running page, the first test would take longer if they are in another order
+ public class AlphabeticalOrderer : ITestCaseOrderer
+ {
+ public IEnumerable OrderTestCases(IEnumerable testCases)
+ where TTestCase : ITestCase
+ {
+ List result = testCases.ToList();
+ result.Sort((x, y) => StringComparer.Ordinal.Compare(x.TestMethod.Method.Name, y.TestMethod.Method.Name));
+ return result;
+ }
+ }
+}
diff --git a/src/libraries/System.Net.WebSockets.Client/tests/wasm/System.Net.WebSockets.Client.Wasm.Tests.csproj b/src/libraries/System.Net.WebSockets.Client/tests/wasm/System.Net.WebSockets.Client.Wasm.Tests.csproj
new file mode 100644
index 00000000000000..754539cfe25eaa
--- /dev/null
+++ b/src/libraries/System.Net.WebSockets.Client/tests/wasm/System.Net.WebSockets.Client.Wasm.Tests.csproj
@@ -0,0 +1,66 @@
+
+
+ ../../src/Resources/Strings.resx
+ $(NetCoreAppCurrent)-Browser
+ $(DefineConstants);NETSTANDARD
+
+
+
+ --background-throttling
+ WasmTestOnBrowser
+ $(TestArchiveRoot)browseronly/
+ $(TestArchiveTestsRoot)$(OSPlatformConfig)/
+ $(DefineConstants);TARGET_BROWSER
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/libraries/System.Net.WebSockets.Client/tests/wasm/System.Net.WebSockets.Client.Wasm.Tests.sln b/src/libraries/System.Net.WebSockets.Client/tests/wasm/System.Net.WebSockets.Client.Wasm.Tests.sln
new file mode 100644
index 00000000000000..11f24affd5e1c1
--- /dev/null
+++ b/src/libraries/System.Net.WebSockets.Client/tests/wasm/System.Net.WebSockets.Client.Wasm.Tests.sln
@@ -0,0 +1,25 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 17
+VisualStudioVersion = 17.0.31521.260
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.WebSockets.Client.Wasm.Tests", "System.Net.WebSockets.Client.Wasm.Tests.csproj", "{DA6DF153-169E-485D-90A4-EDBDA54B32A6}"
+EndProject
+Global
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|Any CPU = Debug|Any CPU
+ Release|Any CPU = Release|Any CPU
+ EndGlobalSection
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {DA6DF153-169E-485D-90A4-EDBDA54B32A6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {DA6DF153-169E-485D-90A4-EDBDA54B32A6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {DA6DF153-169E-485D-90A4-EDBDA54B32A6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {DA6DF153-169E-485D-90A4-EDBDA54B32A6}.Release|Any CPU.Build.0 = Release|Any CPU
+ EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
+ EndGlobalSection
+ GlobalSection(ExtensibilityGlobals) = postSolution
+ SolutionGuid = {627DB5DF-DE31-44B4-B5FD-E5666467145E}
+ EndGlobalSection
+EndGlobal
diff --git a/src/libraries/System.Net.WebSockets/src/Resources/Strings.resx b/src/libraries/System.Net.WebSockets/src/Resources/Strings.resx
index 693f8d3863fd7f..e96ac19e3f8ef4 100644
--- a/src/libraries/System.Net.WebSockets/src/Resources/Strings.resx
+++ b/src/libraries/System.Net.WebSockets/src/Resources/Strings.resx
@@ -165,4 +165,7 @@
The compression options for a continuation cannot be different than the options used to send the first fragment of the message.
-
\ No newline at end of file
+
+ The WebSocket received a frame with an invalid payload length.
+
+
diff --git a/src/libraries/System.Net.WebSockets/src/System/Net/WebSockets/Compression/WebSocketDeflater.cs b/src/libraries/System.Net.WebSockets/src/System/Net/WebSockets/Compression/WebSocketDeflater.cs
index 7d8eb832c2e2ad..7c8db8eedcc871 100644
--- a/src/libraries/System.Net.WebSockets/src/System/Net/WebSockets/Compression/WebSocketDeflater.cs
+++ b/src/libraries/System.Net.WebSockets/src/System/Net/WebSockets/Compression/WebSocketDeflater.cs
@@ -144,7 +144,13 @@ private unsafe void UnsafeDeflate(ReadOnlySpan input, Span output, o
consumed = input.Length - (int)_stream.AvailIn;
written = output.Length - (int)_stream.AvailOut;
- needsMoreBuffer = errorCode == ErrorCode.BufError || _stream.AvailIn > 0;
+ // It is important here to also check that we haven't
+ // exhausted the output buffer because after deflating we're
+ // always going to issue a flush and a flush with empty output
+ // is going to throw.
+ needsMoreBuffer = errorCode == ErrorCode.BufError
+ || _stream.AvailIn > 0
+ || written == output.Length;
}
}
@@ -152,6 +158,7 @@ private unsafe int UnsafeFlush(Span output, out bool needsMoreBuffer)
{
Debug.Assert(_stream is not null);
Debug.Assert(_stream.AvailIn == 0);
+ Debug.Assert(output.Length > 0);
fixed (byte* fixedOutput = output)
{
diff --git a/src/libraries/System.Net.WebSockets/src/System/Net/WebSockets/ManagedWebSocket.cs b/src/libraries/System.Net.WebSockets/src/System/Net/WebSockets/ManagedWebSocket.cs
index 05b171cf94ed72..ec62d92ac11a9a 100644
--- a/src/libraries/System.Net.WebSockets/src/System/Net/WebSockets/ManagedWebSocket.cs
+++ b/src/libraries/System.Net.WebSockets/src/System/Net/WebSockets/ManagedWebSocket.cs
@@ -1116,6 +1116,14 @@ private async ValueTask CloseWithReceiveErrorAndThrowAsync(
return SR.net_Websockets_ReservedBitsSet;
}
+ if (header.PayloadLength < 0)
+ {
+ // as per RFC, if payload length is a 64-bit integer, the most significant bit MUST be 0
+ // frame-payload-length-63 = %x0000000000000000-7FFFFFFFFFFFFFFF; 64 bits in length
+ resultHeader = default;
+ return SR.net_Websockets_InvalidPayloadLength;
+ }
+
if (header.Compressed && _inflater is null)
{
resultHeader = default;
diff --git a/src/libraries/System.Net.WebSockets/tests/WebSocketCreateTest.cs b/src/libraries/System.Net.WebSockets/tests/WebSocketCreateTest.cs
index f940df0add3aee..f9fd4e3c564e57 100644
--- a/src/libraries/System.Net.WebSockets/tests/WebSocketCreateTest.cs
+++ b/src/libraries/System.Net.WebSockets/tests/WebSocketCreateTest.cs
@@ -149,6 +149,37 @@ public async Task ReceiveAsync_InvalidFrameHeader_AbortsAndThrowsException(byte
}
}
+ [Theory]
+ [InlineData(new byte[] { 0x7F, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF }, false)] // max allowed value
+ [InlineData(new byte[] { 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, true)]
+ public async Task ReceiveAsync_InvalidPayloadLength_AbortsAndThrowsException(byte[] lenBytes, bool shouldFail)
+ {
+ var frame = new byte[11];
+ frame[0] = 0b1_000_0010; // FIN, RSV, OPCODE
+ frame[1] = 0b0_1111111; // MASK, PAYLOAD_LEN
+ Assert.Equal(8, lenBytes.Length);
+ Array.Copy(lenBytes, 0, frame, 2, lenBytes.Length); // EXTENDED_PAYLOAD_LEN
+ frame[10] = (byte)'a';
+
+ using var stream = new MemoryStream(frame, writable: true);
+ using WebSocket websocket = CreateFromStream(stream, false, null, Timeout.InfiniteTimeSpan);
+
+ var buffer = new byte[1];
+ Task t = websocket.ReceiveAsync(new ArraySegment(buffer), CancellationToken.None);
+ if (shouldFail)
+ {
+ var exc = await Assert.ThrowsAsync(() => t);
+ Assert.Equal(WebSocketState.Aborted, websocket.State);
+ }
+ else
+ {
+ WebSocketReceiveResult result = await t;
+ Assert.False(result.EndOfMessage);
+ Assert.Equal(1, result.Count);
+ Assert.Equal('a', (char)buffer[0]);
+ }
+ }
+
[Fact]
[SkipOnPlatform(TestPlatforms.Browser, "System.Net.Sockets is not supported on this platform.")]
[ActiveIssue("https://github.com/dotnet/runtime/issues/34690", TestPlatforms.Windows, TargetFrameworkMonikers.Netcoreapp, TestRuntimes.Mono)]
diff --git a/src/libraries/System.Private.CoreLib/generators/EventSourceGenerator.Parser.cs b/src/libraries/System.Private.CoreLib/generators/EventSourceGenerator.Parser.cs
index be971bb185f0b8..2b28b46e03335b 100644
--- a/src/libraries/System.Private.CoreLib/generators/EventSourceGenerator.Parser.cs
+++ b/src/libraries/System.Private.CoreLib/generators/EventSourceGenerator.Parser.cs
@@ -7,10 +7,10 @@
using System.Security.Cryptography;
using System.Text;
using System.Threading;
-
using Microsoft.CodeAnalysis;
using Microsoft.CodeAnalysis.CSharp;
using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.DotnetRuntime.Extensions;
namespace Generators
{
@@ -31,14 +31,14 @@ public Parser(Compilation compilation, Action reportDiagnostic, Canc
public EventSourceClass[] GetEventSourceClasses(List classDeclarations)
{
- INamedTypeSymbol? autogenerateAttribute = _compilation.GetTypeByMetadataName("System.Diagnostics.Tracing.EventSourceAutoGenerateAttribute");
+ INamedTypeSymbol? autogenerateAttribute = _compilation.GetBestTypeByMetadataName("System.Diagnostics.Tracing.EventSourceAutoGenerateAttribute");
if (autogenerateAttribute is null)
{
// No EventSourceAutoGenerateAttribute
return Array.Empty();
}
- INamedTypeSymbol? eventSourceAttribute = _compilation.GetTypeByMetadataName("System.Diagnostics.Tracing.EventSourceAttribute");
+ INamedTypeSymbol? eventSourceAttribute = _compilation.GetBestTypeByMetadataName("System.Diagnostics.Tracing.EventSourceAttribute");
if (eventSourceAttribute is null)
{
// No EventSourceAttribute
diff --git a/src/libraries/System.Private.CoreLib/generators/System.Private.CoreLib.Generators.csproj b/src/libraries/System.Private.CoreLib/generators/System.Private.CoreLib.Generators.csproj
index bf6c663b56432f..451bb520f66ead 100644
--- a/src/libraries/System.Private.CoreLib/generators/System.Private.CoreLib.Generators.csproj
+++ b/src/libraries/System.Private.CoreLib/generators/System.Private.CoreLib.Generators.csproj
@@ -15,6 +15,7 @@
+
diff --git a/src/libraries/System.Private.CoreLib/src/ILLink/ILLink.Descriptors.LibraryBuild.xml b/src/libraries/System.Private.CoreLib/src/ILLink/ILLink.Descriptors.LibraryBuild.xml
index 53a41aff8c935a..ee28b6e38cfe61 100644
--- a/src/libraries/System.Private.CoreLib/src/ILLink/ILLink.Descriptors.LibraryBuild.xml
+++ b/src/libraries/System.Private.CoreLib/src/ILLink/ILLink.Descriptors.LibraryBuild.xml
@@ -4,5 +4,9 @@
+
+
+
+
diff --git a/src/libraries/System.Private.CoreLib/src/Microsoft/Win32/SafeHandles/SafeFileHandle.OverlappedValueTaskSource.Windows.cs b/src/libraries/System.Private.CoreLib/src/Microsoft/Win32/SafeHandles/SafeFileHandle.OverlappedValueTaskSource.Windows.cs
index 9f689b161bbd00..c2eab851bd60e2 100644
--- a/src/libraries/System.Private.CoreLib/src/Microsoft/Win32/SafeHandles/SafeFileHandle.OverlappedValueTaskSource.Windows.cs
+++ b/src/libraries/System.Private.CoreLib/src/Microsoft/Win32/SafeHandles/SafeFileHandle.OverlappedValueTaskSource.Windows.cs
@@ -86,8 +86,11 @@ internal static Exception GetIOError(int errorCode, string? path)
_bufferSize = memory.Length;
_memoryHandle = memory.Pin();
_overlapped = _fileHandle.ThreadPoolBinding!.AllocateNativeOverlapped(_preallocatedOverlapped);
- _overlapped->OffsetLow = (int)fileOffset;
- _overlapped->OffsetHigh = (int)(fileOffset >> 32);
+ if (_fileHandle.CanSeek)
+ {
+ _overlapped->OffsetLow = (int)fileOffset;
+ _overlapped->OffsetHigh = (int)(fileOffset >> 32);
+ }
return _overlapped;
}
diff --git a/src/libraries/System.Private.CoreLib/src/Microsoft/Win32/SafeHandles/SafeFileHandle.Unix.cs b/src/libraries/System.Private.CoreLib/src/Microsoft/Win32/SafeHandles/SafeFileHandle.Unix.cs
index ee1def85b9e024..266fd93e5082da 100644
--- a/src/libraries/System.Private.CoreLib/src/Microsoft/Win32/SafeHandles/SafeFileHandle.Unix.cs
+++ b/src/libraries/System.Private.CoreLib/src/Microsoft/Win32/SafeHandles/SafeFileHandle.Unix.cs
@@ -16,6 +16,7 @@ public sealed partial class SafeFileHandle : SafeHandleZeroOrMinusOneIsInvalid
// not using bool? as it's not thread safe
private volatile NullableBool _canSeek = NullableBool.Undefined;
+ private volatile NullableBool _supportsRandomAccess = NullableBool.Undefined;
private bool _deleteOnClose;
private bool _isLocked;
@@ -33,6 +34,25 @@ private SafeFileHandle(bool ownsHandle)
internal bool CanSeek => !IsClosed && GetCanSeek();
+ internal bool SupportsRandomAccess
+ {
+ get
+ {
+ NullableBool supportsRandomAccess = _supportsRandomAccess;
+ if (supportsRandomAccess == NullableBool.Undefined)
+ {
+ _supportsRandomAccess = supportsRandomAccess = GetCanSeek() ? NullableBool.True : NullableBool.False;
+ }
+
+ return supportsRandomAccess == NullableBool.True;
+ }
+ set
+ {
+ Debug.Assert(value == false); // We should only use the setter to disable random access.
+ _supportsRandomAccess = value ? NullableBool.True : NullableBool.False;
+ }
+ }
+
internal ThreadPoolBoundHandle? ThreadPoolBinding => null;
internal void EnsureThreadPoolBindingInitialized() { /* nop */ }
@@ -121,17 +141,6 @@ private static bool DirectoryExists(string fullPath)
protected override bool ReleaseHandle()
{
- // When the SafeFileHandle was opened, we likely issued an flock on the created descriptor in order to add
- // an advisory lock. This lock should be removed via closing the file descriptor, but close can be
- // interrupted, and we don't retry closes. As such, we could end up leaving the file locked,
- // which could prevent subsequent usage of the file until this process dies. To avoid that, we proactively
- // try to release the lock before we close the handle.
- if (_isLocked)
- {
- Interop.Sys.FLock(handle, Interop.Sys.LockOperations.LOCK_UN); // ignore any errors
- _isLocked = false;
- }
-
// If DeleteOnClose was requested when constructed, delete the file now.
// (Unix doesn't directly support DeleteOnClose, so we mimic it here.)
if (_deleteOnClose)
@@ -143,6 +152,17 @@ protected override bool ReleaseHandle()
Interop.Sys.Unlink(_path); // ignore errors; it's valid that the path may no longer exist
}
+ // When the SafeFileHandle was opened, we likely issued an flock on the created descriptor in order to add
+ // an advisory lock. This lock should be removed via closing the file descriptor, but close can be
+ // interrupted, and we don't retry closes. As such, we could end up leaving the file locked,
+ // which could prevent subsequent usage of the file until this process dies. To avoid that, we proactively
+ // try to release the lock before we close the handle.
+ if (_isLocked)
+ {
+ Interop.Sys.FLock(handle, Interop.Sys.LockOperations.LOCK_UN); // ignore any errors
+ _isLocked = false;
+ }
+
// Close the descriptor. Although close is documented to potentially fail with EINTR, we never want
// to retry, as the descriptor could actually have been closed, been subsequently reassigned, and
// be in use elsewhere in the process. Instead, we simply check whether the call was successful.
@@ -274,7 +294,6 @@ private static Interop.Sys.OpenFlags PreOpenConfigurationFromOptions(FileMode mo
private void Init(string path, FileMode mode, FileAccess access, FileShare share, FileOptions options, long preallocationSize)
{
IsAsync = (options & FileOptions.Asynchronous) != 0;
- _deleteOnClose = (options & FileOptions.DeleteOnClose) != 0;
// Lock the file if requested via FileShare. This is only advisory locking. FileShare.None implies an exclusive
// lock on the file and all other modes use a shared lock. While this is not as granular as Windows, not mandatory,
@@ -293,6 +312,10 @@ private void Init(string path, FileMode mode, FileAccess access, FileShare share
}
}
+ // Enable DeleteOnClose when we've succesfully locked the file.
+ // On Windows, the locking happens atomically as part of opening the file.
+ _deleteOnClose = (options & FileOptions.DeleteOnClose) != 0;
+
// These provide hints around how the file will be accessed. Specifying both RandomAccess
// and Sequential together doesn't make sense as they are two competing options on the same spectrum,
// so if both are specified, we prefer RandomAccess (behavior on Windows is unspecified if both are provided).
@@ -323,20 +346,24 @@ private void Init(string path, FileMode mode, FileAccess access, FileShare share
}
}
- // If preallocationSize has been provided for a creatable and writeable file
- if (FileStreamHelpers.ShouldPreallocate(preallocationSize, access, mode))
+ if (preallocationSize > 0 && Interop.Sys.FAllocate(this, 0, preallocationSize) < 0)
{
- int fallocateResult = Interop.Sys.PosixFAllocate(this, 0, preallocationSize);
- if (fallocateResult != 0)
+ Interop.ErrorInfo errorInfo = Interop.Sys.GetLastErrorInfo();
+
+ // Only throw for errors that indicate there is not enough space.
+ if (errorInfo.Error == Interop.Error.EFBIG ||
+ errorInfo.Error == Interop.Error.ENOSPC)
{
Dispose();
- Interop.Sys.Unlink(path!); // remove the file to mimic Windows behaviour (atomic operation)
- Debug.Assert(fallocateResult == -1 || fallocateResult == -2);
- throw new IOException(SR.Format(
- fallocateResult == -1 ? SR.IO_DiskFull_Path_AllocationSize : SR.IO_FileTooLarge_Path_AllocationSize,
- path,
- preallocationSize));
+ // Delete the file we've created.
+ Debug.Assert(mode == FileMode.Create || mode == FileMode.CreateNew);
+ Interop.Sys.Unlink(path!);
+
+ throw new IOException(SR.Format(errorInfo.Error == Interop.Error.EFBIG
+ ? SR.IO_FileTooLarge_Path_AllocationSize
+ : SR.IO_DiskFull_Path_AllocationSize,
+ path, preallocationSize));
}
}
}
diff --git a/src/libraries/System.Private.CoreLib/src/Microsoft/Win32/SafeHandles/SafeFileHandle.Windows.cs b/src/libraries/System.Private.CoreLib/src/Microsoft/Win32/SafeHandles/SafeFileHandle.Windows.cs
index a7c4751a094786..3352f0194e73b9 100644
--- a/src/libraries/System.Private.CoreLib/src/Microsoft/Win32/SafeHandles/SafeFileHandle.Windows.cs
+++ b/src/libraries/System.Private.CoreLib/src/Microsoft/Win32/SafeHandles/SafeFileHandle.Windows.cs
@@ -34,7 +34,7 @@ internal static unsafe SafeFileHandle Open(string fullPath, FileMode mode, FileA
// of converting DOS to NT file paths (RtlDosPathNameToRelativeNtPathName_U_WithStatus is not documented)
SafeFileHandle fileHandle = CreateFile(fullPath, mode, access, share, options);
- if (FileStreamHelpers.ShouldPreallocate(preallocationSize, access, mode))
+ if (preallocationSize > 0)
{
Preallocate(fullPath, preallocationSize, fileHandle);
}
@@ -121,19 +121,19 @@ private static unsafe void Preallocate(string fullPath, long preallocationSize,
{
int errorCode = Marshal.GetLastPInvokeError();
- // we try to mimic the atomic NtCreateFile here:
- // if preallocation fails, close the handle and delete the file
- fileHandle.Dispose();
- Interop.Kernel32.DeleteFile(fullPath);
-
- switch (errorCode)
+ // Only throw for errors that indicate there is not enough space.
+ if (errorCode == Interop.Errors.ERROR_DISK_FULL ||
+ errorCode == Interop.Errors.ERROR_FILE_TOO_LARGE)
{
- case Interop.Errors.ERROR_DISK_FULL:
- throw new IOException(SR.Format(SR.IO_DiskFull_Path_AllocationSize, fullPath, preallocationSize));
- case Interop.Errors.ERROR_FILE_TOO_LARGE:
- throw new IOException(SR.Format(SR.IO_FileTooLarge_Path_AllocationSize, fullPath, preallocationSize));
- default:
- throw Win32Marshal.GetExceptionForWin32Error(errorCode, fullPath);
+ fileHandle.Dispose();
+
+ // Delete the file we've created.
+ Interop.Kernel32.DeleteFile(fullPath);
+
+ throw new IOException(SR.Format(errorCode == Interop.Errors.ERROR_DISK_FULL
+ ? SR.IO_DiskFull_Path_AllocationSize
+ : SR.IO_FileTooLarge_Path_AllocationSize,
+ fullPath, preallocationSize));
}
}
}
diff --git a/src/libraries/System.Private.CoreLib/src/Resources/Strings.resx b/src/libraries/System.Private.CoreLib/src/Resources/Strings.resx
index 6cd99cac9c9531..cb95472d7f96d3 100644
--- a/src/libraries/System.Private.CoreLib/src/Resources/Strings.resx
+++ b/src/libraries/System.Private.CoreLib/src/Resources/Strings.resx
@@ -528,6 +528,9 @@
Type passed must be an interface.
+
+ Object must be of type NFloat.
+
Type must be a Pointer.
@@ -1092,6 +1095,12 @@
Append access can be requested only in write-only mode.
+
+ Preallocation size can be requested only in write mode.
+
+
+ Preallocation size can be requested only for new files.
+
Type of argument is not compatible with the generic comparer.
@@ -2659,9 +2668,6 @@
BindHandle for ThreadPool failed on this handle.
-
- The link's file system entry type is inconsistent with that of its target: {0}
-
The file '{0}' already exists.
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 5a1593f032c69a..ce942ea7e85696 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
@@ -2029,8 +2029,8 @@
Common\Interop\Unix\System.Native\Interop.PosixFAdvise.cs
-
- Common\Interop\Unix\System.Native\Interop.PosixFAllocate.cs
+
+ Common\Interop\Unix\System.Native\Interop.FAllocate.cs
Common\Interop\Unix\System.Native\Interop.PRead.cs
@@ -2098,7 +2098,7 @@
-
+
@@ -2112,6 +2112,8 @@
+
+
@@ -2155,14 +2157,15 @@
Link="Common\Interop\Linux\Interop.ProcFsStat.TryReadStatusFile.cs" />
-
-
+
+
@@ -2325,4 +2328,4 @@
-
\ No newline at end of file
+
diff --git a/src/libraries/System.Private.CoreLib/src/System/AppContext.AnyOS.cs b/src/libraries/System.Private.CoreLib/src/System/AppContext.AnyOS.cs
index c8b5fcba415f5e..94760aa0ef991c 100644
--- a/src/libraries/System.Private.CoreLib/src/System/AppContext.AnyOS.cs
+++ b/src/libraries/System.Private.CoreLib/src/System/AppContext.AnyOS.cs
@@ -1,7 +1,10 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
+using System.Collections.Generic;
+using System.Diagnostics;
using System.Diagnostics.CodeAnalysis;
+using System.Diagnostics.Tracing;
using System.IO;
using System.Reflection;
@@ -30,5 +33,52 @@ private static string GetBaseDirectoryCore()
return directory;
}
+
+ internal static void LogSwitchValues(RuntimeEventSource ev)
+ {
+ if (s_switches is not null)
+ {
+ lock (s_switches)
+ {
+ foreach (KeyValuePair kvp in s_switches)
+ {
+ // Convert bool to int because it's cheaper to log (no boxing)
+ ev.LogAppContextSwitch(kvp.Key, kvp.Value ? 1 : 0);
+ }
+ }
+ }
+
+ if (s_dataStore is not null)
+ {
+ lock (s_dataStore)
+ {
+ if (s_switches is not null)
+ {
+ lock (s_switches)
+ {
+ LogDataStore(ev, s_switches);
+ }
+ }
+ else
+ {
+ LogDataStore(ev, null);
+ }
+
+ static void LogDataStore(RuntimeEventSource ev, Dictionary? switches)
+ {
+ Debug.Assert(s_dataStore is not null);
+ foreach (KeyValuePair kvp in s_dataStore)
+ {
+ if (kvp.Value is string s &&
+ bool.TryParse(s, out bool isEnabled) &&
+ switches?.ContainsKey(kvp.Key) != true)
+ {
+ ev.LogAppContextSwitch(kvp.Key, isEnabled ? 1 : 0);
+ }
+ }
+ }
+ }
+ }
+ }
}
}
diff --git a/src/libraries/System.Private.CoreLib/src/System/Byte.cs b/src/libraries/System.Private.CoreLib/src/System/Byte.cs
index 3d5b448159a63d..cbf21d307d636e 100644
--- a/src/libraries/System.Private.CoreLib/src/System/Byte.cs
+++ b/src/libraries/System.Private.CoreLib/src/System/Byte.cs
@@ -285,11 +285,11 @@ object IConvertible.ToType(Type type, IFormatProvider? provider)
// IAdditionOperators
//
- [RequiresPreviewFeatures]
+ [RequiresPreviewFeatures(Number.PreviewFeatureMessage, Url = Number.PreviewFeatureUrl)]
static byte IAdditionOperators.operator +(byte left, byte right)
=> (byte)(left + right);
- // [RequiresPreviewFeatures]
+ // [RequiresPreviewFeatures(Number.PreviewFeatureMessage, Url = Number.PreviewFeatureUrl)]
// static checked byte IAdditionOperators.operator +(byte left, byte right)
// => checked((byte)(left + right));
@@ -297,30 +297,30 @@ object IConvertible.ToType(Type type, IFormatProvider? provider)
// IAdditiveIdentity
//
- [RequiresPreviewFeatures]
+ [RequiresPreviewFeatures(Number.PreviewFeatureMessage, Url = Number.PreviewFeatureUrl)]
static byte IAdditiveIdentity.AdditiveIdentity => 0;
//
// IBinaryInteger
//
- [RequiresPreviewFeatures]
+ [RequiresPreviewFeatures(Number.PreviewFeatureMessage, Url = Number.PreviewFeatureUrl)]
static byte IBinaryInteger.LeadingZeroCount(byte value)
=> (byte)(BitOperations.LeadingZeroCount(value) - 24);
- [RequiresPreviewFeatures]
+ [RequiresPreviewFeatures(Number.PreviewFeatureMessage, Url = Number.PreviewFeatureUrl)]
static byte IBinaryInteger.PopCount(byte value)
=> (byte)BitOperations.PopCount(value);
- [RequiresPreviewFeatures]
+ [RequiresPreviewFeatures(Number.PreviewFeatureMessage, Url = Number.PreviewFeatureUrl)]
static byte IBinaryInteger.RotateLeft(byte value, int rotateAmount)
=> (byte)((value << (rotateAmount & 7)) | (value >> ((8 - rotateAmount) & 7)));
- [RequiresPreviewFeatures]
+ [RequiresPreviewFeatures(Number.PreviewFeatureMessage, Url = Number.PreviewFeatureUrl)]
static byte IBinaryInteger.RotateRight(byte value, int rotateAmount)
=> (byte)((value >> (rotateAmount & 7)) | (value << ((8 - rotateAmount) & 7)));
- [RequiresPreviewFeatures]
+ [RequiresPreviewFeatures(Number.PreviewFeatureMessage, Url = Number.PreviewFeatureUrl)]
static byte IBinaryInteger.TrailingZeroCount(byte value)
=> (byte)(BitOperations.TrailingZeroCount(value << 24) - 24);
@@ -328,11 +328,11 @@ static byte IBinaryInteger.TrailingZeroCount(byte value)
// IBinaryNumber
//
- [RequiresPreviewFeatures]
+ [RequiresPreviewFeatures(Number.PreviewFeatureMessage, Url = Number.PreviewFeatureUrl)]
static bool IBinaryNumber.IsPow2(byte value)
=> BitOperations.IsPow2((uint)value);
- [RequiresPreviewFeatures]
+ [RequiresPreviewFeatures(Number.PreviewFeatureMessage, Url = Number.PreviewFeatureUrl)]
static byte IBinaryNumber.Log2(byte value)
=> (byte)BitOperations.Log2(value);
@@ -340,19 +340,19 @@ static byte IBinaryNumber.Log2(byte value)
// IBitwiseOperators
//
- [RequiresPreviewFeatures]
+ [RequiresPreviewFeatures(Number.PreviewFeatureMessage, Url = Number.PreviewFeatureUrl)]
static byte IBitwiseOperators.operator &(byte left, byte right)
=> (byte)(left & right);
- [RequiresPreviewFeatures]
+ [RequiresPreviewFeatures(Number.PreviewFeatureMessage, Url = Number.PreviewFeatureUrl)]
static byte IBitwiseOperators.operator |(byte left, byte right)
=> (byte)(left | right);
- [RequiresPreviewFeatures]
+ [RequiresPreviewFeatures(Number.PreviewFeatureMessage, Url = Number.PreviewFeatureUrl)]
static byte IBitwiseOperators.operator ^(byte left, byte right)
=> (byte)(left ^ right);
- [RequiresPreviewFeatures]
+ [RequiresPreviewFeatures(Number.PreviewFeatureMessage, Url = Number.PreviewFeatureUrl)]
static byte IBitwiseOperators.operator ~(byte value)
=> (byte)(~value);
@@ -360,19 +360,19 @@ static byte IBinaryNumber.Log2(byte value)
// IComparisonOperators
//
- [RequiresPreviewFeatures]
+ [RequiresPreviewFeatures(Number.PreviewFeatureMessage, Url = Number.PreviewFeatureUrl)]
static bool IComparisonOperators.operator <(byte left, byte right)
=> left < right;
- [RequiresPreviewFeatures]
+ [RequiresPreviewFeatures(Number.PreviewFeatureMessage, Url = Number.PreviewFeatureUrl)]
static bool IComparisonOperators.operator <=(byte left, byte right)
=> left <= right;
- [RequiresPreviewFeatures]
+ [RequiresPreviewFeatures(Number.PreviewFeatureMessage, Url = Number.PreviewFeatureUrl)]
static bool IComparisonOperators.operator >(byte left, byte right)
=> left > right;
- [RequiresPreviewFeatures]
+ [RequiresPreviewFeatures(Number.PreviewFeatureMessage, Url = Number.PreviewFeatureUrl)]
static bool IComparisonOperators.operator >=(byte left, byte right)
=> left >= right;
@@ -380,11 +380,11 @@ static byte IBinaryNumber.Log2(byte value)
// IDecrementOperators
//
- [RequiresPreviewFeatures]
+ [RequiresPreviewFeatures(Number.PreviewFeatureMessage, Url = Number.PreviewFeatureUrl)]
static byte IDecrementOperators.operator --(byte value)
=> --value;
- // [RequiresPreviewFeatures]
+ // [RequiresPreviewFeatures(Number.PreviewFeatureMessage, Url = Number.PreviewFeatureUrl)]
// static checked byte IDecrementOperators.operator --(byte value)
// => checked(--value);
@@ -392,11 +392,11 @@ static byte IBinaryNumber.Log2(byte value)
// IDivisionOperators
//
- [RequiresPreviewFeatures]
+ [RequiresPreviewFeatures(Number.PreviewFeatureMessage, Url = Number.PreviewFeatureUrl)]
static byte IDivisionOperators.operator /(byte left, byte right)
=> (byte)(left / right);
- // [RequiresPreviewFeatures]
+ // [RequiresPreviewFeatures(Number.PreviewFeatureMessage, Url = Number.PreviewFeatureUrl)]
// static checked byte IDivisionOperators.operator /(byte left, byte right)
// => checked((byte)(left / right));
@@ -404,11 +404,11 @@ static byte IBinaryNumber.Log2(byte value)
// IEqualityOperators
//
- [RequiresPreviewFeatures]
+ [RequiresPreviewFeatures(Number.PreviewFeatureMessage, Url = Number.PreviewFeatureUrl)]
static bool IEqualityOperators.operator ==(byte left, byte right)
=> left == right;
- [RequiresPreviewFeatures]
+ [RequiresPreviewFeatures(Number.PreviewFeatureMessage, Url = Number.PreviewFeatureUrl)]
static bool IEqualityOperators.operator !=(byte left, byte right)
=> left != right;
@@ -416,11 +416,11 @@ static byte IBinaryNumber.Log2(byte value)
// IIncrementOperators
//
- [RequiresPreviewFeatures]
+ [RequiresPreviewFeatures(Number.PreviewFeatureMessage, Url = Number.PreviewFeatureUrl)]
static byte IIncrementOperators.operator ++(byte value)
=> ++value;
- // [RequiresPreviewFeatures]
+ // [RequiresPreviewFeatures(Number.PreviewFeatureMessage, Url = Number.PreviewFeatureUrl)]
// static checked byte IIncrementOperators.operator ++(byte value)
// => checked(++value);
@@ -428,21 +428,21 @@ static byte IBinaryNumber.Log2(byte value)
// IMinMaxValue
//
- [RequiresPreviewFeatures]
+ [RequiresPreviewFeatures(Number.PreviewFeatureMessage, Url = Number.PreviewFeatureUrl)]
static byte IMinMaxValue.MinValue => MinValue;
- [RequiresPreviewFeatures]
+ [RequiresPreviewFeatures(Number.PreviewFeatureMessage, Url = Number.PreviewFeatureUrl)]
static byte IMinMaxValue.MaxValue => MaxValue;
//
// IModulusOperators
//
- [RequiresPreviewFeatures]
+ [RequiresPreviewFeatures(Number.PreviewFeatureMessage, Url = Number.PreviewFeatureUrl)]
static byte IModulusOperators.operator %(byte left, byte right)
=> (byte)(left % right);
- // [RequiresPreviewFeatures]
+ // [RequiresPreviewFeatures(Number.PreviewFeatureMessage, Url = Number.PreviewFeatureUrl)]
// static checked byte IModulusOperators.operator %(byte left, byte right)
// => checked((byte)(left % right));
@@ -450,18 +450,18 @@ static byte IBinaryNumber.Log2(byte value)
// IMultiplicativeIdentity
//
- [RequiresPreviewFeatures]
+ [RequiresPreviewFeatures(Number.PreviewFeatureMessage, Url = Number.PreviewFeatureUrl)]
static byte IMultiplicativeIdentity.MultiplicativeIdentity => 1;
//
// IMultiplyOperators
//
- [RequiresPreviewFeatures]
+ [RequiresPreviewFeatures(Number.PreviewFeatureMessage, Url = Number.PreviewFeatureUrl)]
static byte IMultiplyOperators.operator *(byte left, byte right)
=> (byte)(left * right);
- // [RequiresPreviewFeatures]
+ // [RequiresPreviewFeatures(Number.PreviewFeatureMessage, Url = Number.PreviewFeatureUrl)]
// static checked byte IMultiplyOperators.operator *(byte left, byte right)
// => checked((byte)(left * right));
@@ -469,21 +469,21 @@ static byte IBinaryNumber.Log2(byte value)
// INumber
//
- [RequiresPreviewFeatures]
+ [RequiresPreviewFeatures(Number.PreviewFeatureMessage, Url = Number.PreviewFeatureUrl)]
static byte INumber.One => 1;
- [RequiresPreviewFeatures]
+ [RequiresPreviewFeatures(Number.PreviewFeatureMessage, Url = Number.PreviewFeatureUrl)]
static byte INumber.Zero => 0;
- [RequiresPreviewFeatures]
+ [RequiresPreviewFeatures(Number.PreviewFeatureMessage, Url = Number.PreviewFeatureUrl)]
static byte INumber.Abs(byte value)
=> value;
- [RequiresPreviewFeatures]
+ [RequiresPreviewFeatures(Number.PreviewFeatureMessage, Url = Number.PreviewFeatureUrl)]
static byte INumber.Clamp(byte value, byte min, byte max)
=> Math.Clamp(value, min, max);
- [RequiresPreviewFeatures]
+ [RequiresPreviewFeatures(Number.PreviewFeatureMessage, Url = Number.PreviewFeatureUrl)]
[MethodImpl(MethodImplOptions.AggressiveInlining)]
static byte INumber.Create(TOther value)
{
@@ -550,7 +550,7 @@ static byte INumber.Create(TOther value)
}
}
- [RequiresPreviewFeatures]
+ [RequiresPreviewFeatures(Number.PreviewFeatureMessage, Url = Number.PreviewFeatureUrl)]
[MethodImpl(MethodImplOptions.AggressiveInlining)]
static byte INumber.CreateSaturating(TOther value)
{
@@ -637,7 +637,7 @@ static byte INumber.CreateSaturating(TOther value)
}
}
- [RequiresPreviewFeatures]
+ [RequiresPreviewFeatures(Number.PreviewFeatureMessage, Url = Number.PreviewFeatureUrl)]
[MethodImpl(MethodImplOptions.AggressiveInlining)]
static byte INumber.CreateTruncating(TOther value)
{
@@ -704,31 +704,31 @@ static byte INumber.CreateTruncating(TOther value)
}
}
- [RequiresPreviewFeatures]
+ [RequiresPreviewFeatures(Number.PreviewFeatureMessage, Url = Number.PreviewFeatureUrl)]
static (byte Quotient, byte Remainder) INumber.DivRem(byte left, byte right)
=> Math.DivRem(left, right);
- [RequiresPreviewFeatures]
+ [RequiresPreviewFeatures(Number.PreviewFeatureMessage, Url = Number.PreviewFeatureUrl)]
static byte INumber.Max(byte x, byte y)
=> Math.Max(x, y);
- [RequiresPreviewFeatures]
+ [RequiresPreviewFeatures(Number.PreviewFeatureMessage, Url = Number.PreviewFeatureUrl)]
static byte INumber.Min(byte x, byte y)
=> Math.Min(x, y);
- [RequiresPreviewFeatures]
+ [RequiresPreviewFeatures(Number.PreviewFeatureMessage, Url = Number.PreviewFeatureUrl)]
static byte INumber.Parse(string s, NumberStyles style, IFormatProvider? provider)
=> Parse(s, style, provider);
- [RequiresPreviewFeatures]
+ [RequiresPreviewFeatures(Number.PreviewFeatureMessage, Url = Number.PreviewFeatureUrl)]
static byte INumber.Parse(ReadOnlySpan s, NumberStyles style, IFormatProvider? provider)
=> Parse(s, style, provider);
- [RequiresPreviewFeatures]
+ [RequiresPreviewFeatures(Number.PreviewFeatureMessage, Url = Number.PreviewFeatureUrl)]
static byte INumber.Sign(byte value)
=> (byte)((value == 0) ? 0 : 1);
- [RequiresPreviewFeatures]
+ [RequiresPreviewFeatures(Number.PreviewFeatureMessage, Url = Number.PreviewFeatureUrl)]
[MethodImpl(MethodImplOptions.AggressiveInlining)]
static bool INumber.TryCreate(TOther value, out byte result)
{
@@ -914,11 +914,11 @@ static bool INumber.TryCreate(TOther value, out byte result)
}
}
- [RequiresPreviewFeatures]
+ [RequiresPreviewFeatures(Number.PreviewFeatureMessage, Url = Number.PreviewFeatureUrl)]
static bool INumber.TryParse([NotNullWhen(true)] string? s, NumberStyles style, IFormatProvider? provider, out byte result)
=> TryParse(s, style, provider, out result);
- [RequiresPreviewFeatures]
+ [RequiresPreviewFeatures(Number.PreviewFeatureMessage, Url = Number.PreviewFeatureUrl)]
static bool INumber.TryParse(ReadOnlySpan s, NumberStyles style, IFormatProvider? provider, out byte result)
=> TryParse(s, style, provider, out result);
@@ -926,11 +926,11 @@ static bool INumber.TryParse(ReadOnlySpan s, NumberStyles style, IFo
// IParseable
//
- [RequiresPreviewFeatures]
+ [RequiresPreviewFeatures(Number.PreviewFeatureMessage, Url = Number.PreviewFeatureUrl)]
static byte IParseable.Parse(string s, IFormatProvider? provider)
=> Parse(s, provider);
- [RequiresPreviewFeatures]
+ [RequiresPreviewFeatures(Number.PreviewFeatureMessage, Url = Number.PreviewFeatureUrl)]
static bool IParseable.TryParse([NotNullWhen(true)] string? s, IFormatProvider? provider, out byte result)
=> TryParse(s, NumberStyles.Integer, provider, out result);
@@ -938,15 +938,15 @@ static bool IParseable.TryParse([NotNullWhen(true)] string? s, IFormatProv
// IShiftOperators
//
- [RequiresPreviewFeatures]
+ [RequiresPreviewFeatures(Number.PreviewFeatureMessage, Url = Number.PreviewFeatureUrl)]
static byte IShiftOperators.operator <<(byte value, int shiftAmount)
=> (byte)(value << shiftAmount);
- [RequiresPreviewFeatures]
+ [RequiresPreviewFeatures(Number.PreviewFeatureMessage, Url = Number.PreviewFeatureUrl)]
static byte IShiftOperators.operator >>(byte value, int shiftAmount)
=> (byte)(value >> shiftAmount);
- // [RequiresPreviewFeatures]
+ // [RequiresPreviewFeatures(Number.PreviewFeatureMessage, Url = Number.PreviewFeatureUrl)]
// static byte IShiftOperators.operator >>>(byte value, int shiftAmount)
// => (byte)(value >> shiftAmount);
@@ -954,11 +954,11 @@ static bool IParseable.TryParse([NotNullWhen(true)] string? s, IFormatProv
// ISpanParseable
//
- [RequiresPreviewFeatures]
+ [RequiresPreviewFeatures(Number.PreviewFeatureMessage, Url = Number.PreviewFeatureUrl)]
static byte ISpanParseable.Parse(ReadOnlySpan s, IFormatProvider? provider)
=> Parse(s, NumberStyles.Integer, provider);
- [RequiresPreviewFeatures]
+ [RequiresPreviewFeatures(Number.PreviewFeatureMessage, Url = Number.PreviewFeatureUrl)]
static bool ISpanParseable.TryParse(ReadOnlySpan s, IFormatProvider? provider, out byte result)
=> TryParse(s, NumberStyles.Integer, provider, out result);
@@ -966,11 +966,11 @@ static bool ISpanParseable.TryParse(ReadOnlySpan s, IFormatProvider?
// ISubtractionOperators
//
- [RequiresPreviewFeatures]
+ [RequiresPreviewFeatures(Number.PreviewFeatureMessage, Url = Number.PreviewFeatureUrl)]
static byte ISubtractionOperators.operator -(byte left, byte right)
=> (byte)(left - right);
- // [RequiresPreviewFeatures]
+ // [RequiresPreviewFeatures(Number.PreviewFeatureMessage, Url = Number.PreviewFeatureUrl)]
// static checked byte ISubtractionOperators.operator -(byte left, byte right)
// => checked((byte)(left - right));
@@ -978,11 +978,11 @@ static bool ISpanParseable.TryParse(ReadOnlySpan s, IFormatProvider?
// IUnaryNegationOperators
//
- [RequiresPreviewFeatures]
+ [RequiresPreviewFeatures(Number.PreviewFeatureMessage, Url = Number.PreviewFeatureUrl)]
static byte IUnaryNegationOperators.operator -(byte value)
=> (byte)(-value);
- // [RequiresPreviewFeatures]
+ // [RequiresPreviewFeatures(Number.PreviewFeatureMessage, Url = Number.PreviewFeatureUrl)]
// static checked byte IUnaryNegationOperators.operator -(byte value)
// => checked((byte)(-value));
@@ -990,11 +990,11 @@ static bool ISpanParseable.TryParse(ReadOnlySpan s, IFormatProvider?
// IUnaryPlusOperators
//
- [RequiresPreviewFeatures]
+ [RequiresPreviewFeatures(Number.PreviewFeatureMessage, Url = Number.PreviewFeatureUrl)]
static byte IUnaryPlusOperators.operator +(byte value)
=> (byte)(+value);
- // [RequiresPreviewFeatures]
+ // [RequiresPreviewFeatures(Number.PreviewFeatureMessage, Url = Number.PreviewFeatureUrl)]
// static checked byte IUnaryPlusOperators.operator +(byte value)
// => checked((byte)(+value));
#endif // FEATURE_GENERIC_MATH
diff --git a/src/libraries/System.Private.CoreLib/src/System/Char.cs b/src/libraries/System.Private.CoreLib/src/System/Char.cs
index 26ff3399fe10ed..497b60b5d3449b 100644
--- a/src/libraries/System.Private.CoreLib/src/System/Char.cs
+++ b/src/libraries/System.Private.CoreLib/src/System/Char.cs
@@ -1065,11 +1065,11 @@ public static int ConvertToUtf32(string s, int index)
// IAdditionOperators
//
- [RequiresPreviewFeatures]
+ [RequiresPreviewFeatures(Number.PreviewFeatureMessage, Url = Number.PreviewFeatureUrl)]
static char IAdditionOperators.operator +(char left, char right)
=> (char)(left + right);
- // [RequiresPreviewFeatures]
+ // [RequiresPreviewFeatures(Number.PreviewFeatureMessage, Url = Number.PreviewFeatureUrl)]
// static checked char IAdditionOperators.operator +(char left, char right)
// => checked((char)(left + right));
@@ -1077,30 +1077,30 @@ public static int ConvertToUtf32(string s, int index)
// IAdditiveIdentity
//
- [RequiresPreviewFeatures]
+ [RequiresPreviewFeatures(Number.PreviewFeatureMessage, Url = Number.PreviewFeatureUrl)]
static char IAdditiveIdentity.AdditiveIdentity => (char)0;
//
// IBinaryInteger
//
- [RequiresPreviewFeatures]
+ [RequiresPreviewFeatures(Number.PreviewFeatureMessage, Url = Number.PreviewFeatureUrl)]
static char IBinaryInteger.LeadingZeroCount(char value)
=> (char)(BitOperations.LeadingZeroCount(value) - 16);
- [RequiresPreviewFeatures]
+ [RequiresPreviewFeatures(Number.PreviewFeatureMessage, Url = Number.PreviewFeatureUrl)]
static char IBinaryInteger.PopCount(char value)
=> (char)BitOperations.PopCount(value);
- [RequiresPreviewFeatures]
+ [RequiresPreviewFeatures(Number.PreviewFeatureMessage, Url = Number.PreviewFeatureUrl)]
static char IBinaryInteger.RotateLeft(char value, int rotateAmount)
=> (char)((value << (rotateAmount & 15)) | (value >> ((16 - rotateAmount) & 15)));
- [RequiresPreviewFeatures]
+ [RequiresPreviewFeatures(Number.PreviewFeatureMessage, Url = Number.PreviewFeatureUrl)]
static char IBinaryInteger.RotateRight(char value, int rotateAmount)
=> (char)((value >> (rotateAmount & 15)) | (value << ((16 - rotateAmount) & 15)));
- [RequiresPreviewFeatures]
+ [RequiresPreviewFeatures(Number.PreviewFeatureMessage, Url = Number.PreviewFeatureUrl)]
static char IBinaryInteger.TrailingZeroCount(char value)
=> (char)(BitOperations.TrailingZeroCount(value << 16) - 16);
@@ -1108,11 +1108,11 @@ static char IBinaryInteger.TrailingZeroCount(char value)
// IBinaryNumber
//
- [RequiresPreviewFeatures]
+ [RequiresPreviewFeatures(Number.PreviewFeatureMessage, Url = Number.PreviewFeatureUrl)]
static bool IBinaryNumber.IsPow2(char value)
=> BitOperations.IsPow2((uint)value);
- [RequiresPreviewFeatures]
+ [RequiresPreviewFeatures(Number.PreviewFeatureMessage, Url = Number.PreviewFeatureUrl)]
static char IBinaryNumber.Log2(char value)
=> (char)BitOperations.Log2(value);
@@ -1120,19 +1120,19 @@ static char IBinaryNumber.Log2(char value)
// IBitwiseOperators
//
- [RequiresPreviewFeatures]
+ [RequiresPreviewFeatures(Number.PreviewFeatureMessage, Url = Number.PreviewFeatureUrl)]
static char IBitwiseOperators.operator &(char left, char right)
=> (char)(left & right);
- [RequiresPreviewFeatures]
+ [RequiresPreviewFeatures(Number.PreviewFeatureMessage, Url = Number.PreviewFeatureUrl)]
static char IBitwiseOperators.operator |(char left, char right)
=> (char)(left | right);
- [RequiresPreviewFeatures]
+ [RequiresPreviewFeatures(Number.PreviewFeatureMessage, Url = Number.PreviewFeatureUrl)]
static char IBitwiseOperators.operator ^(char left, char right)
=> (char)(left ^ right);
- [RequiresPreviewFeatures]
+ [RequiresPreviewFeatures(Number.PreviewFeatureMessage, Url = Number.PreviewFeatureUrl)]
static char IBitwiseOperators.operator ~(char value)
=> (char)(~value);
@@ -1140,19 +1140,19 @@ static char IBinaryNumber.Log2(char value)
// IComparisonOperators
//
- [RequiresPreviewFeatures]
+ [RequiresPreviewFeatures(Number.PreviewFeatureMessage, Url = Number.PreviewFeatureUrl)]
static bool IComparisonOperators.operator <(char left, char right)
=> left < right;
- [RequiresPreviewFeatures]
+ [RequiresPreviewFeatures(Number.PreviewFeatureMessage, Url = Number.PreviewFeatureUrl)]
static bool IComparisonOperators.operator <=(char left, char right)
=> left <= right;
- [RequiresPreviewFeatures]
+ [RequiresPreviewFeatures(Number.PreviewFeatureMessage, Url = Number.PreviewFeatureUrl)]
static bool IComparisonOperators.operator >(char left, char right)
=> left > right;
- [RequiresPreviewFeatures]
+ [RequiresPreviewFeatures(Number.PreviewFeatureMessage, Url = Number.PreviewFeatureUrl)]
static bool IComparisonOperators.operator >=(char left, char right)
=> left >= right;
@@ -1160,11 +1160,11 @@ static char IBinaryNumber.Log2(char value)
// IDecrementOperators
//
- [RequiresPreviewFeatures]
+ [RequiresPreviewFeatures(Number.PreviewFeatureMessage, Url = Number.PreviewFeatureUrl)]
static char IDecrementOperators.operator --(char value)
=> --value;
- // [RequiresPreviewFeatures]
+ // [RequiresPreviewFeatures(Number.PreviewFeatureMessage, Url = Number.PreviewFeatureUrl)]
// static checked char IDecrementOperators.operator --(char value)
// => checked(--value);
@@ -1172,11 +1172,11 @@ static char IBinaryNumber.Log2(char value)
// IDivisionOperators
//
- [RequiresPreviewFeatures]
+ [RequiresPreviewFeatures(Number.PreviewFeatureMessage, Url = Number.PreviewFeatureUrl)]
static char IDivisionOperators.operator /(char left, char right)
=> (char)(left / right);
- // [RequiresPreviewFeatures]
+ // [RequiresPreviewFeatures(Number.PreviewFeatureMessage, Url = Number.PreviewFeatureUrl)]
// static checked char IDivisionOperators.operator /(char left, char right)
// => checked((char)(left / right));
@@ -1184,11 +1184,11 @@ static char IBinaryNumber.Log2(char value)
// IEqualityOperators
//
- [RequiresPreviewFeatures]
+ [RequiresPreviewFeatures(Number.PreviewFeatureMessage, Url = Number.PreviewFeatureUrl)]
static bool IEqualityOperators.operator ==(char left, char right)
=> left == right;
- [RequiresPreviewFeatures]
+ [RequiresPreviewFeatures(Number.PreviewFeatureMessage, Url = Number.PreviewFeatureUrl)]
static bool IEqualityOperators.operator !=(char left, char right)
=> left != right;
@@ -1196,11 +1196,11 @@ static char IBinaryNumber.Log2(char value)
// IIncrementOperators
//
- [RequiresPreviewFeatures]
+ [RequiresPreviewFeatures(Number.PreviewFeatureMessage, Url = Number.PreviewFeatureUrl)]
static char IIncrementOperators.operator ++(char value)
=> ++value;
- // [RequiresPreviewFeatures]
+ // [RequiresPreviewFeatures(Number.PreviewFeatureMessage, Url = Number.PreviewFeatureUrl)]
// static checked char IIncrementOperators.operator ++(char value)
// => checked(++value);
@@ -1208,21 +1208,21 @@ static char IBinaryNumber.Log2(char value)
// IMinMaxValue
//
- [RequiresPreviewFeatures]
+ [RequiresPreviewFeatures(Number.PreviewFeatureMessage, Url = Number.PreviewFeatureUrl)]
static char IMinMaxValue.MinValue => MinValue;
- [RequiresPreviewFeatures]
+ [RequiresPreviewFeatures(Number.PreviewFeatureMessage, Url = Number.PreviewFeatureUrl)]
static char IMinMaxValue.MaxValue => MaxValue;
//
// IModulusOperators
//
- [RequiresPreviewFeatures]
+ [RequiresPreviewFeatures(Number.PreviewFeatureMessage, Url = Number.PreviewFeatureUrl)]
static char IModulusOperators.operator %(char left, char right)
=> (char)(left % right);
- // [RequiresPreviewFeatures]
+ // [RequiresPreviewFeatures(Number.PreviewFeatureMessage, Url = Number.PreviewFeatureUrl)]
// static checked char IModulusOperators.operator %(char left, char right)
// => checked((char)(left % right));
@@ -1230,18 +1230,18 @@ static char IBinaryNumber.Log2(char value)
// IMultiplicativeIdentity
//
- [RequiresPreviewFeatures]
+ [RequiresPreviewFeatures(Number.PreviewFeatureMessage, Url = Number.PreviewFeatureUrl)]
static char IMultiplicativeIdentity.MultiplicativeIdentity => (char)1;
//
// IMultiplyOperators
//
- [RequiresPreviewFeatures]
+ [RequiresPreviewFeatures(Number.PreviewFeatureMessage, Url = Number.PreviewFeatureUrl)]
static char IMultiplyOperators.operator *(char left, char right)
=> (char)(left * right);
- // [RequiresPreviewFeatures]
+ // [RequiresPreviewFeatures(Number.PreviewFeatureMessage, Url = Number.PreviewFeatureUrl)]
// static checked char IMultiplyOperators.operator *(char left, char right)
// => checked((char)(left * right));
@@ -1249,21 +1249,21 @@ static char IBinaryNumber.Log2(char value)
// INumber
//
- [RequiresPreviewFeatures]
+ [RequiresPreviewFeatures(Number.PreviewFeatureMessage, Url = Number.PreviewFeatureUrl)]
static char INumber.One => (char)1;
- [RequiresPreviewFeatures]
+ [RequiresPreviewFeatures(Number.PreviewFeatureMessage, Url = Number.PreviewFeatureUrl)]
static char INumber.Zero => (char)0;
- [RequiresPreviewFeatures]
+ [RequiresPreviewFeatures(Number.PreviewFeatureMessage, Url = Number.PreviewFeatureUrl)]
static char INumber.Abs(char value)
=> value;
- [RequiresPreviewFeatures]
+ [RequiresPreviewFeatures(Number.PreviewFeatureMessage, Url = Number.PreviewFeatureUrl)]
static char INumber.Clamp(char value, char min, char max)
=> (char)Math.Clamp(value, min, max);
- [RequiresPreviewFeatures]
+ [RequiresPreviewFeatures(Number.PreviewFeatureMessage, Url = Number.PreviewFeatureUrl)]
[MethodImpl(MethodImplOptions.AggressiveInlining)]
static char INumber.Create(TOther value)
{
@@ -1330,7 +1330,7 @@ static char INumber.Create(TOther value)
}
}
- [RequiresPreviewFeatures]
+ [RequiresPreviewFeatures(Number.PreviewFeatureMessage, Url = Number.PreviewFeatureUrl)]
[MethodImpl(MethodImplOptions.AggressiveInlining)]
static char INumber.CreateSaturating(TOther value)
{
@@ -1414,7 +1414,7 @@ static char INumber.CreateSaturating(TOther value)
}
}
- [RequiresPreviewFeatures]
+ [RequiresPreviewFeatures(Number.PreviewFeatureMessage, Url = Number.PreviewFeatureUrl)]
[MethodImpl(MethodImplOptions.AggressiveInlining)]
static char INumber.CreateTruncating(TOther value)
{
@@ -1481,23 +1481,23 @@ static char INumber.CreateTruncating(TOther value)
}
}
- [RequiresPreviewFeatures]
+ [RequiresPreviewFeatures(Number.PreviewFeatureMessage, Url = Number.PreviewFeatureUrl)]
static (char Quotient, char Remainder) INumber.DivRem(char left, char right)
=> ((char, char))Math.DivRem(left, right);
- [RequiresPreviewFeatures]
+ [RequiresPreviewFeatures(Number.PreviewFeatureMessage, Url = Number.PreviewFeatureUrl)]
static char INumber.Max(char x, char y)
=> (char)Math.Max(x, y);
- [RequiresPreviewFeatures]
+ [RequiresPreviewFeatures(Number.PreviewFeatureMessage, Url = Number.PreviewFeatureUrl)]
static char INumber.Min(char x, char y)
=> (char)Math.Min(x, y);
- [RequiresPreviewFeatures]
+ [RequiresPreviewFeatures(Number.PreviewFeatureMessage, Url = Number.PreviewFeatureUrl)]
static char INumber.Parse(string s, NumberStyles style, IFormatProvider? provider)
=> Parse(s);
- [RequiresPreviewFeatures]
+ [RequiresPreviewFeatures(Number.PreviewFeatureMessage, Url = Number.PreviewFeatureUrl)]
static char INumber.Parse(ReadOnlySpan s, NumberStyles style, IFormatProvider? provider)
{
if (s.Length != 1)
@@ -1507,11 +1507,11 @@ static char INumber.Parse(ReadOnlySpan s, NumberStyles style, IForma
return s[0];
}
- [RequiresPreviewFeatures]
+ [RequiresPreviewFeatures(Number.PreviewFeatureMessage, Url = Number.PreviewFeatureUrl)]
static char INumber.Sign(char value)
=> (char)((value == 0) ? 0 : 1);
- [RequiresPreviewFeatures]
+ [RequiresPreviewFeatures(Number.PreviewFeatureMessage, Url = Number.PreviewFeatureUrl)]
[MethodImpl(MethodImplOptions.AggressiveInlining)]
static bool INumber.TryCreate(TOther value, out char result)
{
@@ -1689,11 +1689,11 @@ static bool INumber.TryCreate(TOther value, out char result)
}
}
- [RequiresPreviewFeatures]
+ [RequiresPreviewFeatures(Number.PreviewFeatureMessage, Url = Number.PreviewFeatureUrl)]
static bool INumber.TryParse([NotNullWhen(true)] string? s, NumberStyles style, IFormatProvider? provider, out char result)
=> TryParse(s, out result);
- [RequiresPreviewFeatures]
+ [RequiresPreviewFeatures(Number.PreviewFeatureMessage, Url = Number.PreviewFeatureUrl)]
static bool INumber.TryParse(ReadOnlySpan s, NumberStyles style, IFormatProvider? provider, out char result)
{
if (s.Length != 1)
@@ -1709,11 +1709,11 @@ static bool INumber.TryParse(ReadOnlySpan s, NumberStyles style, IFo
// IParseable
//
- [RequiresPreviewFeatures]
+ [RequiresPreviewFeatures(Number.PreviewFeatureMessage, Url = Number.PreviewFeatureUrl)]
static char IParseable.Parse(string s, IFormatProvider? provider)
=> Parse(s);
- [RequiresPreviewFeatures]
+ [RequiresPreviewFeatures(Number.PreviewFeatureMessage, Url = Number.PreviewFeatureUrl)]
static bool IParseable.TryParse([NotNullWhen(true)] string? s, IFormatProvider? provider, out char result)
=> TryParse(s, out result);
@@ -1721,15 +1721,15 @@ static bool IParseable.TryParse([NotNullWhen(true)] string? s, IFormatProv
// IShiftOperators
//
- [RequiresPreviewFeatures]
+ [RequiresPreviewFeatures(Number.PreviewFeatureMessage, Url = Number.PreviewFeatureUrl)]
static char IShiftOperators.operator <<(char value, int shiftAmount)
=> (char)(value << shiftAmount);
- [RequiresPreviewFeatures]
+ [RequiresPreviewFeatures(Number.PreviewFeatureMessage, Url = Number.PreviewFeatureUrl)]
static char IShiftOperators.operator >>(char value, int shiftAmount)
=> (char)(value >> shiftAmount);
- // [RequiresPreviewFeatures]
+ // [RequiresPreviewFeatures(Number.PreviewFeatureMessage, Url = Number.PreviewFeatureUrl)]
// static char IShiftOperators.operator >>>(char value, int shiftAmount)
// => (char)(value >> shiftAmount);
@@ -1737,7 +1737,7 @@ static bool IParseable.TryParse([NotNullWhen(true)] string? s, IFormatProv
// ISpanParseable
//
- [RequiresPreviewFeatures]
+ [RequiresPreviewFeatures(Number.PreviewFeatureMessage, Url = Number.PreviewFeatureUrl)]
static char ISpanParseable.Parse(ReadOnlySpan s, IFormatProvider? provider)
{
if (s.Length != 1)
@@ -1747,7 +1747,7 @@ static char ISpanParseable.Parse(ReadOnlySpan s, IFormatProvider? pr
return s[0];
}
- [RequiresPreviewFeatures]
+ [RequiresPreviewFeatures(Number.PreviewFeatureMessage, Url = Number.PreviewFeatureUrl)]
static bool ISpanParseable.TryParse(ReadOnlySpan s, IFormatProvider? provider, out char result)
{
if (s.Length != 1)
@@ -1763,11 +1763,11 @@ static bool ISpanParseable.TryParse(ReadOnlySpan s, IFormatProvider?
// ISubtractionOperators
//
- [RequiresPreviewFeatures]
+ [RequiresPreviewFeatures(Number.PreviewFeatureMessage, Url = Number.PreviewFeatureUrl)]
static char ISubtractionOperators.operator -(char left, char right)
=> (char)(left - right);
- // [RequiresPreviewFeatures]
+ // [RequiresPreviewFeatures(Number.PreviewFeatureMessage, Url = Number.PreviewFeatureUrl)]
// static checked char ISubtractionOperators.operator -(char left, char right)
// => checked((char)(left - right));
@@ -1775,11 +1775,11 @@ static bool ISpanParseable.TryParse(ReadOnlySpan s, IFormatProvider?
// IUnaryNegationOperators
//
- [RequiresPreviewFeatures]
+ [RequiresPreviewFeatures(Number.PreviewFeatureMessage, Url = Number.PreviewFeatureUrl)]
static char IUnaryNegationOperators.operator -(char value)
=> (char)(-value);
- // [RequiresPreviewFeatures]
+ // [RequiresPreviewFeatures(Number.PreviewFeatureMessage, Url = Number.PreviewFeatureUrl)]
// static checked char IUnaryNegationOperators.operator -(char value)
// => checked((char)(-value));
@@ -1787,11 +1787,11 @@ static bool ISpanParseable.TryParse(ReadOnlySpan s, IFormatProvider?
// IUnaryPlusOperators
//
- [RequiresPreviewFeatures]
+ [RequiresPreviewFeatures(Number.PreviewFeatureMessage, Url = Number.PreviewFeatureUrl)]
static char IUnaryPlusOperators.operator +(char value)
=> (char)(+value);
- // [RequiresPreviewFeatures]
+ // [RequiresPreviewFeatures(Number.PreviewFeatureMessage, Url = Number.PreviewFeatureUrl)]
// static checked char IUnaryPlusOperators.operator +(char value)
// => checked((char)(+value));
#endif // FEATURE_GENERIC_MATH
diff --git a/src/libraries/System.Private.CoreLib/src/System/DateOnly.cs b/src/libraries/System.Private.CoreLib/src/System/DateOnly.cs
index 7e64638fa51031..955ecb17b79c34 100644
--- a/src/libraries/System.Private.CoreLib/src/System/DateOnly.cs
+++ b/src/libraries/System.Private.CoreLib/src/System/DateOnly.cs
@@ -817,15 +817,13 @@ public string ToString(string? format, IFormatProvider? provider)
return DateTimeFormat.TryFormat(GetEquivalentDateTime(), destination, out charsWritten, format, provider);
default:
- charsWritten = 0;
- return false;
+ throw new FormatException(SR.Argument_BadFormatSpecifier);
}
}
if (!DateTimeFormat.IsValidCustomDateFormat(format, throwOnError: false))
{
- charsWritten = 0;
- return false;
+ throw new FormatException(SR.Format(SR.Format_DateTimeOnlyContainsNoneDateParts, format.ToString(), nameof(DateOnly)));
}
return DateTimeFormat.TryFormat(GetEquivalentDateTime(), destination, out charsWritten, format, provider);
@@ -836,19 +834,19 @@ public string ToString(string? format, IFormatProvider? provider)
// IComparisonOperators
//
- [RequiresPreviewFeatures]
+ [RequiresPreviewFeatures(Number.PreviewFeatureMessage, Url = Number.PreviewFeatureUrl)]
static bool IComparisonOperators.operator <(DateOnly left, DateOnly right)
=> left < right;
- [RequiresPreviewFeatures]
+ [RequiresPreviewFeatures(Number.PreviewFeatureMessage, Url = Number.PreviewFeatureUrl)]
static bool IComparisonOperators.operator <=(DateOnly left, DateOnly right)
=> left <= right;
- [RequiresPreviewFeatures]
+ [RequiresPreviewFeatures(Number.PreviewFeatureMessage, Url = Number.PreviewFeatureUrl)]
static bool IComparisonOperators.operator >(DateOnly left, DateOnly right)
=> left > right;
- [RequiresPreviewFeatures]
+ [RequiresPreviewFeatures(Number.PreviewFeatureMessage, Url = Number.PreviewFeatureUrl)]
static bool IComparisonOperators.operator >=(DateOnly left, DateOnly right)
=> left >= right;
@@ -856,11 +854,11 @@ public string ToString(string? format, IFormatProvider? provider)
// IEqualityOperators
//
- [RequiresPreviewFeatures]
+ [RequiresPreviewFeatures(Number.PreviewFeatureMessage, Url = Number.PreviewFeatureUrl)]
static bool IEqualityOperators.operator ==(DateOnly left, DateOnly right)
=> left == right;
- [RequiresPreviewFeatures]
+ [RequiresPreviewFeatures(Number.PreviewFeatureMessage, Url = Number.PreviewFeatureUrl)]
static bool IEqualityOperators.operator !=(DateOnly left, DateOnly right)
=> left != right;
@@ -868,21 +866,21 @@ public string ToString(string? format, IFormatProvider? provider)
// IMinMaxValue
//
- [RequiresPreviewFeatures]
+ [RequiresPreviewFeatures(Number.PreviewFeatureMessage, Url = Number.PreviewFeatureUrl)]
static DateOnly IMinMaxValue.MinValue => MinValue;
- [RequiresPreviewFeatures]
+ [RequiresPreviewFeatures(Number.PreviewFeatureMessage, Url = Number.PreviewFeatureUrl)]
static DateOnly IMinMaxValue.MaxValue => MaxValue;
//
// IParseable
//
- [RequiresPreviewFeatures]
+ [RequiresPreviewFeatures(Number.PreviewFeatureMessage, Url = Number.PreviewFeatureUrl)]
static DateOnly IParseable.Parse(string s, IFormatProvider? provider)
=> Parse(s, provider, DateTimeStyles.None);
- [RequiresPreviewFeatures]
+ [RequiresPreviewFeatures(Number.PreviewFeatureMessage, Url = Number.PreviewFeatureUrl)]
static bool IParseable.TryParse([NotNullWhen(true)] string? s, IFormatProvider? provider, out DateOnly result)
=> TryParse(s, provider, DateTimeStyles.None, out result);
@@ -890,11 +888,11 @@ static bool IParseable.TryParse([NotNullWhen(true)] string? s, IFormat
// ISpanParseable
//
- [RequiresPreviewFeatures]
+ [RequiresPreviewFeatures(Number.PreviewFeatureMessage, Url = Number.PreviewFeatureUrl)]
static DateOnly ISpanParseable.Parse(ReadOnlySpan s, IFormatProvider? provider)
=> Parse(s, provider, DateTimeStyles.None);
- [RequiresPreviewFeatures]
+ [RequiresPreviewFeatures(Number.PreviewFeatureMessage, Url = Number.PreviewFeatureUrl)]
static bool ISpanParseable.TryParse(ReadOnlySpan s, IFormatProvider? provider, out DateOnly result)
=> TryParse(s, provider, DateTimeStyles.None, out result);
#endif // FEATURE_GENERIC_MATH
diff --git a/src/libraries/System.Private.CoreLib/src/System/DateTime.cs b/src/libraries/System.Private.CoreLib/src/System/DateTime.cs
index 1d0235268a14ec..5017c7c49cceca 100644
--- a/src/libraries/System.Private.CoreLib/src/System/DateTime.cs
+++ b/src/libraries/System.Private.CoreLib/src/System/DateTime.cs
@@ -1521,11 +1521,11 @@ internal static bool TryCreate(int year, int month, int day, int hour, int minut
// IAdditionOperators
//
- [RequiresPreviewFeatures]
+ [RequiresPreviewFeatures(Number.PreviewFeatureMessage, Url = Number.PreviewFeatureUrl)]
static DateTime IAdditionOperators.operator +(DateTime left, TimeSpan right)
=> left + right;
- // [RequiresPreviewFeatures]
+ // [RequiresPreviewFeatures(Number.PreviewFeatureMessage, Url = Number.PreviewFeatureUrl)]
// static checked DateTime IAdditionOperators.operator +(DateTime left, TimeSpan right)
// => checked(left + right);
@@ -1533,7 +1533,7 @@ internal static bool TryCreate(int year, int month, int day, int hour, int minut
// IAdditiveIdentity
//
- [RequiresPreviewFeatures]
+ [RequiresPreviewFeatures(Number.PreviewFeatureMessage, Url = Number.PreviewFeatureUrl)]
static TimeSpan IAdditiveIdentity.AdditiveIdentity
=> default;
@@ -1541,19 +1541,19 @@ static TimeSpan IAdditiveIdentity.AdditiveIdentity
// IComparisonOperators
//
- [RequiresPreviewFeatures]
+ [RequiresPreviewFeatures(Number.PreviewFeatureMessage, Url = Number.PreviewFeatureUrl)]
static bool IComparisonOperators.operator <(DateTime left, DateTime right)
=> left < right;
- [RequiresPreviewFeatures]
+ [RequiresPreviewFeatures(Number.PreviewFeatureMessage, Url = Number.PreviewFeatureUrl)]
static bool IComparisonOperators.operator <=(DateTime left, DateTime right)
=> left <= right;
- [RequiresPreviewFeatures]
+ [RequiresPreviewFeatures(Number.PreviewFeatureMessage, Url = Number.PreviewFeatureUrl)]
static bool IComparisonOperators.operator >(DateTime left, DateTime right)
=> left > right;
- [RequiresPreviewFeatures]
+ [RequiresPreviewFeatures(Number.PreviewFeatureMessage, Url = Number.PreviewFeatureUrl)]
static bool IComparisonOperators.operator >=(DateTime left, DateTime right)
=> left >= right;
@@ -1561,11 +1561,11 @@ static TimeSpan IAdditiveIdentity.AdditiveIdentity
// IEqualityOperators
//
- [RequiresPreviewFeatures]
+ [RequiresPreviewFeatures(Number.PreviewFeatureMessage, Url = Number.PreviewFeatureUrl)]
static bool IEqualityOperators.operator ==(DateTime left, DateTime right)
=> left == right;
- [RequiresPreviewFeatures]
+ [RequiresPreviewFeatures(Number.PreviewFeatureMessage, Url = Number.PreviewFeatureUrl)]
static bool IEqualityOperators.operator !=(DateTime left, DateTime right)
=> left != right;
@@ -1573,21 +1573,21 @@ static TimeSpan IAdditiveIdentity