Remove STA thread affinitisation (servicing) (#5953)

dotnet · Oct 13, 2021 · b7b6ae8 · b7b6ae8
1 parent 14ae9f8
commit b7b6ae8
Show file tree

Hide file tree

Showing 11 changed files with 0 additions and 44 deletions.
diff --git a/...s.CSharp/src/System/Windows/Forms/Generators/ApplicationConfigurationInitializeBuilder.cs b/...s.CSharp/src/System/Windows/Forms/Generators/ApplicationConfigurationInitializeBuilder.cs
@@ -90,10 +90,6 @@ internal static partial class ApplicationConfiguration
     /// </summary>
     public static void Initialize()
     {{
-        // Set STAThread
-        Thread.CurrentThread.SetApartmentState(ApartmentState.Unknown);
-        Thread.CurrentThread.SetApartmentState(ApartmentState.STA);
-
 {2}
     }}
 }}

diff --git a/...ionConfigurationInitializeBuilderTests.GenerateInitialize_DefaultFont=Tahoma.verified.txt b/...ionConfigurationInitializeBuilderTests.GenerateInitialize_DefaultFont=Tahoma.verified.txt
@@ -22,10 +22,6 @@ internal static partial class ApplicationConfiguration
     /// </summary>
     public static void Initialize()
     {
-        // Set STAThread
-        Thread.CurrentThread.SetApartmentState(ApartmentState.Unknown);
-        Thread.CurrentThread.SetApartmentState(ApartmentState.STA);
-
         Application.EnableVisualStyles();
         Application.SetCompatibleTextRenderingDefault(true);
         Application.SetDefaultFont(new Font(new FontFamily("Tahoma"), 12f, (FontStyle)0, (GraphicsUnit)3));

diff --git a/...onConfigurationInitializeBuilderTests.GenerateInitialize_DefaultFont=default.verified.txt b/...onConfigurationInitializeBuilderTests.GenerateInitialize_DefaultFont=default.verified.txt
@@ -22,10 +22,6 @@ internal static partial class ApplicationConfiguration
     /// </summary>
     public static void Initialize()
     {
-        // Set STAThread
-        Thread.CurrentThread.SetApartmentState(ApartmentState.Unknown);
-        Thread.CurrentThread.SetApartmentState(ApartmentState.STA);
-
         Application.EnableVisualStyles();
         Application.SetCompatibleTextRenderingDefault(true);
         Application.SetDefaultFont(new Font(Control.DefaultFont.FontFamily, 12f, (FontStyle)3, (GraphicsUnit)6));

diff --git a/...ationConfigurationInitializeBuilderTests.GenerateInitialize_DefaultFont=null.verified.txt b/...ationConfigurationInitializeBuilderTests.GenerateInitialize_DefaultFont=null.verified.txt
@@ -21,10 +21,6 @@ internal static partial class ApplicationConfiguration
     /// </summary>
     public static void Initialize()
     {
-        // Set STAThread
-        Thread.CurrentThread.SetApartmentState(ApartmentState.Unknown);
-        Thread.CurrentThread.SetApartmentState(ApartmentState.STA);
-
         Application.EnableVisualStyles();
         Application.SetCompatibleTextRenderingDefault(false);
         Application.SetHighDpiMode(HighDpiMode.SystemAware);

diff --git a/...figurationInitializeBuilderTests.GenerateInitialize_EnableVisualStyles=false.verified.txt b/...figurationInitializeBuilderTests.GenerateInitialize_EnableVisualStyles=false.verified.txt
@@ -20,10 +20,6 @@ internal static partial class ApplicationConfiguration
     /// </summary>
     public static void Initialize()
     {
-        // Set STAThread
-        Thread.CurrentThread.SetApartmentState(ApartmentState.Unknown);
-        Thread.CurrentThread.SetApartmentState(ApartmentState.STA);
-
         Application.SetCompatibleTextRenderingDefault(false);
         Application.SetHighDpiMode(HighDpiMode.SystemAware);
     }

diff --git a/...nfigurationInitializeBuilderTests.GenerateInitialize_EnableVisualStyles=true.verified.txt b/...nfigurationInitializeBuilderTests.GenerateInitialize_EnableVisualStyles=true.verified.txt
@@ -21,10 +21,6 @@ internal static partial class ApplicationConfiguration
     /// </summary>
     public static void Initialize()
     {
-        // Set STAThread
-        Thread.CurrentThread.SetApartmentState(ApartmentState.Unknown);
-        Thread.CurrentThread.SetApartmentState(ApartmentState.STA);
-
         Application.EnableVisualStyles();
         Application.SetCompatibleTextRenderingDefault(false);
         Application.SetHighDpiMode(HighDpiMode.SystemAware);

diff --git a/...gurationInitializeBuilderTests.GenerateInitialize_UseCompTextRendering=false.verified.txt b/...gurationInitializeBuilderTests.GenerateInitialize_UseCompTextRendering=false.verified.txt
@@ -21,10 +21,6 @@ internal static partial class ApplicationConfiguration
     /// </summary>
     public static void Initialize()
     {
-        // Set STAThread
-        Thread.CurrentThread.SetApartmentState(ApartmentState.Unknown);
-        Thread.CurrentThread.SetApartmentState(ApartmentState.STA);
-
         Application.EnableVisualStyles();
         Application.SetCompatibleTextRenderingDefault(false);
         Application.SetHighDpiMode(HighDpiMode.SystemAware);

diff --git a/...igurationInitializeBuilderTests.GenerateInitialize_UseCompTextRendering=true.verified.txt b/...igurationInitializeBuilderTests.GenerateInitialize_UseCompTextRendering=true.verified.txt
@@ -21,10 +21,6 @@ internal static partial class ApplicationConfiguration
     /// </summary>
     public static void Initialize()
     {
-        // Set STAThread
-        Thread.CurrentThread.SetApartmentState(ApartmentState.Unknown);
-        Thread.CurrentThread.SetApartmentState(ApartmentState.STA);
-
         Application.EnableVisualStyles();
         Application.SetCompatibleTextRenderingDefault(true);
         Application.SetHighDpiMode(HighDpiMode.SystemAware);

diff --git a/...s/MockData/ApplicationConfigurationGeneratorTests.GenerateInitialize_default_top_level.cs b/...s/MockData/ApplicationConfigurationGeneratorTests.GenerateInitialize_default_top_level.cs
@@ -21,10 +21,6 @@ internal static partial class ApplicationConfiguration
     /// </summary>
     public static void Initialize()
     {
-        // Set STAThread
-        Thread.CurrentThread.SetApartmentState(ApartmentState.Unknown);
-        Thread.CurrentThread.SetApartmentState(ApartmentState.STA);
-
         Application.EnableVisualStyles();
         Application.SetCompatibleTextRenderingDefault(false);
         Application.{|CS0117:SetHighDpiMode|}({|CS0103:HighDpiMode|}.SystemAware);

diff --git a/...tors/MockData/ApplicationConfigurationGeneratorTests.GenerateInitialize_user_top_level.cs b/...tors/MockData/ApplicationConfigurationGeneratorTests.GenerateInitialize_user_top_level.cs
@@ -22,10 +22,6 @@ internal static partial class ApplicationConfiguration
     /// </summary>
     public static void Initialize()
     {
-        // Set STAThread
-        Thread.CurrentThread.SetApartmentState(ApartmentState.Unknown);
-        Thread.CurrentThread.SetApartmentState(ApartmentState.STA);
-
         Application.EnableVisualStyles();
         Application.SetCompatibleTextRenderingDefault(true);
         Application.{|CS0117:SetDefaultFont|}(new Font(new FontFamily("Microsoft Sans Serif"), 8.25f, (FontStyle)0, (GraphicsUnit)2));

diff --git a/...s/Generators/MockData/ApplicationConfigurationInitializeBuilderTests.default_top_level.cs b/...s/Generators/MockData/ApplicationConfigurationInitializeBuilderTests.default_top_level.cs
@@ -21,10 +21,6 @@ internal static partial class ApplicationConfiguration
     /// </summary>
     public static void Initialize()
     {
-        // Set STAThread
-        Thread.CurrentThread.SetApartmentState(ApartmentState.Unknown);
-        Thread.CurrentThread.SetApartmentState(ApartmentState.STA);
-
         Application.EnableVisualStyles();
         Application.SetCompatibleTextRenderingDefault(false);
         Application.SetHighDpiMode(HighDpiMode.SystemAware);