Skip to content

Commit 90b322a

Browse files
authored
Merge pull request #2561 from monoblaine/fix-turkish-i-problem
Fix Turkish İ problem
2 parents 704e326 + e5ce272 commit 90b322a

4 files changed

Lines changed: 18 additions & 0 deletions

File tree

StyleCop.Analyzers/StyleCop.Analyzers.Test/Helpers/UseCultureAttribute.cs

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,10 @@ public class UseCultureAttribute : BeforeAfterTestAttribute
3333

3434
private CultureInfo originalUiCulture;
3535

36+
private CultureInfo originalDefaultCulture;
37+
38+
private CultureInfo originalDefaultUiCulture;
39+
3640
/// <summary>
3741
/// Initializes a new instance of the <see cref="UseCultureAttribute"/>
3842
/// class with a culture.
@@ -85,9 +89,14 @@ public override void Before(MethodInfo methodUnderTest)
8589
{
8690
this.originalCulture = Thread.CurrentThread.CurrentCulture;
8791
this.originalUiCulture = Thread.CurrentThread.CurrentUICulture;
92+
this.originalDefaultCulture = CultureInfo.DefaultThreadCurrentCulture;
93+
this.originalDefaultUiCulture = CultureInfo.DefaultThreadCurrentUICulture;
8894

8995
Thread.CurrentThread.CurrentCulture = this.Culture;
9096
Thread.CurrentThread.CurrentUICulture = this.UiCulture;
97+
98+
CultureInfo.DefaultThreadCurrentCulture = this.Culture;
99+
CultureInfo.DefaultThreadCurrentUICulture = this.UiCulture;
91100
}
92101

93102
/// <summary>
@@ -99,6 +108,9 @@ public override void After(MethodInfo methodUnderTest)
99108
{
100109
Thread.CurrentThread.CurrentCulture = this.originalCulture;
101110
Thread.CurrentThread.CurrentUICulture = this.originalUiCulture;
111+
112+
CultureInfo.DefaultThreadCurrentCulture = this.originalDefaultCulture;
113+
CultureInfo.DefaultThreadCurrentUICulture = this.originalDefaultUiCulture;
102114
}
103115
}
104116
}

StyleCop.Analyzers/StyleCop.Analyzers.Test/NamingRules/SA1300UnitTests.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,11 @@ namespace StyleCop.Analyzers.Test.NamingRules
99
using Microsoft.CodeAnalysis.CodeFixes;
1010
using Microsoft.CodeAnalysis.Diagnostics;
1111
using StyleCop.Analyzers.NamingRules;
12+
using StyleCop.Analyzers.Test.Helpers;
1213
using TestHelper;
1314
using Xunit;
1415

16+
[UseCulture("en-US")]
1517
public class SA1300UnitTests : CodeFixVerifier
1618
{
1719
[Fact]

StyleCop.Analyzers/StyleCop.Analyzers.Test/NamingRules/SA1312UnitTests.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,11 @@ namespace StyleCop.Analyzers.Test.NamingRules
99
using Microsoft.CodeAnalysis.CodeFixes;
1010
using Microsoft.CodeAnalysis.Diagnostics;
1111
using StyleCop.Analyzers.NamingRules;
12+
using StyleCop.Analyzers.Test.Helpers;
1213
using TestHelper;
1314
using Xunit;
1415

16+
[UseCulture("en-US")]
1517
public class SA1312UnitTests : CodeFixVerifier
1618
{
1719
[Fact]

StyleCop.Analyzers/StyleCop.Analyzers.Test/NamingRules/SA1313UnitTests.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,11 @@ namespace StyleCop.Analyzers.Test.NamingRules
99
using Microsoft.CodeAnalysis.CodeFixes;
1010
using Microsoft.CodeAnalysis.Diagnostics;
1111
using StyleCop.Analyzers.NamingRules;
12+
using StyleCop.Analyzers.Test.Helpers;
1213
using TestHelper;
1314
using Xunit;
1415

16+
[UseCulture("en-US")]
1517
public class SA1313UnitTests : CodeFixVerifier
1618
{
1719
[Fact]

0 commit comments

Comments
 (0)