Skip to content

[release/7.0-staging] Make WindowsServiceLifetime gracefully stop #85656

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ericstj merged 7 commits into from
May 4, 2023
Merged

[release/7.0-staging] Make WindowsServiceLifetime gracefully stop #85656

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
701f7cc
Make WindowsServiceLifetime gracefully stop (#83892)
ericstj Apr 6, 2023
f05ef3e
Fix test condition
ericstj Apr 6, 2023
d7babd0
Enable M.E.H.WindowsServices and S.SP.ServiceController for servicing
ericstj Apr 6, 2023
ba9608b
Make service wait on its state before stopping (#84447)
ericstj Apr 7, 2023
6254c6c
Fix WindowsService Tests where RemoteExecutor is unsupported
VSadov Apr 11, 2023
7dd0c7e
Enable MS.W.C for servicing
ericstj May 2, 2023
5f989c5
Reference latest Microsoft.Extensions.Logging.Abstractions
ericstj May 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix test condition
  • Loading branch information
@ericstj
ericstj committed May 2, 2023
commit f05ef3e6c0c2ca18e8f482a2a2e07f123e1208d4
2 changes: 1 addition & 1 deletion src/libraries/Microsoft.Extensions.Hosting.WindowsServices/tests/UseWindowsServiceTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public void DefaultsToOffOutsideOfService()
Assert.IsType<ConsoleLifetime>(lifetime);
}

[ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsPrivilegedProcess))]
[ConditionalFact(typeof(AdminHelpers), nameof(AdminHelpers.IsProcessElevated))]
public void CanCreateService()
{
using var serviceTester = WindowsServiceTester.Create(() =>
Expand Down
12 changes: 6 additions & 6 deletions ...braries/Microsoft.Extensions.Hosting.WindowsServices/tests/WindowsServiceLifetimeTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ namespace Microsoft.Extensions.Hosting
{
public class WindowsServiceLifetimeTests
{
[ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsPrivilegedProcess))]
[ConditionalFact(typeof(AdminHelpers), nameof(AdminHelpers.IsProcessElevated))]
public void ServiceStops()
{
using var serviceTester = WindowsServiceTester.Create(async () =>
Expand Down Expand Up @@ -60,7 +60,7 @@ public void ServiceStops()
Assert.Equal(0, status.win32ExitCode);
}

[ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsPrivilegedProcess))]
[ConditionalFact(typeof(AdminHelpers), nameof(AdminHelpers.IsProcessElevated))]
[SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework, ".NET Framework is missing the fix from https://github.com/dotnet/corefx/commit/3e68d791066ad0fdc6e0b81828afbd9df00dd7f8")]
public void ExceptionOnStartIsPropagated()
{
Expand All @@ -81,7 +81,7 @@ await Assert.ThrowsAsync<Exception>(async () =>
Assert.Equal(Interop.Errors.ERROR_EXCEPTION_IN_SERVICE, status.win32ExitCode);
}

[ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsPrivilegedProcess))]
[ConditionalFact(typeof(AdminHelpers), nameof(AdminHelpers.IsProcessElevated))]
public void ExceptionOnStopIsPropagated()
{
using var serviceTester = WindowsServiceTester.Create(async () =>
Expand All @@ -103,7 +103,7 @@ await Assert.ThrowsAsync<Exception>( async () =>
Assert.Equal(Interop.Errors.ERROR_PROCESS_ABORTED, status.win32ExitCode);
}

[ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsPrivilegedProcess))]
[ConditionalFact(typeof(AdminHelpers), nameof(AdminHelpers.IsProcessElevated))]
public void CancelStopAsync()
{
using var serviceTester = WindowsServiceTester.Create(async () =>
Expand All @@ -126,7 +126,7 @@ public void CancelStopAsync()
Assert.Equal(Interop.Errors.ERROR_PROCESS_ABORTED, status.win32ExitCode);
}

[ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsPrivilegedProcess))]
[ConditionalFact(typeof(AdminHelpers), nameof(AdminHelpers.IsProcessElevated))]
public void ServiceCanStopItself()
{
using (var serviceTester = WindowsServiceTester.Create(async () =>
Expand Down Expand Up @@ -182,7 +182,7 @@ lifetime stopped
""", logText);
}

[ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsPrivilegedProcess))]
[ConditionalFact(typeof(AdminHelpers), nameof(AdminHelpers.IsProcessElevated))]
public void ServiceSequenceIsCorrect()
{
using (var serviceTester = WindowsServiceTester.Create(() =>
Expand Down