Skip to content

Avoid obsoletion warning suppression in ActiveXHost #10689

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Avoid obsoletion warning suppression in ActiveXHost #10689

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 1 addition & 4 deletions src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Interop/ActiveXHost.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,14 +79,11 @@ static ActiveXHost()
/// constructor for ActiveXHost
internal ActiveXHost(Guid clsid, bool fTrusted ) : base( fTrusted )
{
// Thread.ApartmentState is [Obsolete]
#pragma warning disable 0618
// What if the control is marked as free-threaded?
if (Thread.CurrentThread.ApartmentState != ApartmentState.STA)
if (Thread.CurrentThread.GetApartmentState() is not ApartmentState.STA)
{
throw new ThreadStateException(SR.Format(SR.AxRequiresApartmentThread, clsid.ToString()));
}
#pragma warning restore 0618

_clsid = clsid;

Expand Down