Merge release/dev17.3 to release/dev17.4

src/Workspaces/CSharpTest/OrganizeImports/OrganizeUsingsTests.cs

@@ -11,6 +11,7 @@
 using Microsoft.CodeAnalysis.OrganizeImports;
 using Microsoft.CodeAnalysis.Shared.Extensions;
 using Microsoft.CodeAnalysis.Test.Utilities;
+using Microsoft.CodeAnalysis.UnitTests;
 using Roslyn.Test.Utilities;
 using Xunit;
 
@@ -120,7 +121,7 @@ namespace N2
   {
     using H;
     using G;
-  } 
+  }
 }
 
 namespace N3
@@ -138,7 +139,7 @@ namespace N5
   {
     using N;
     using M;
-  } 
+  }
 }";
 
             var final =
@@ -160,7 +161,7 @@ namespace N2
   {
     using G;
     using H;
-  } 
+  }
 }
 
 namespace N3
@@ -178,7 +179,7 @@ namespace N5
   {
     using M;
     using N;
-  } 
+  }
 }";
             await CheckAsync(initial, final);
         }
@@ -1038,13 +1039,44 @@ public async Task CaseSensitivity1()
 using Bbb;
 using cc;
 using cC;
-using CC;
+using CC;";
 
-// If Kana is sensitive あ != ア, if Kana is insensitive あ == ア.
-// If Width is sensitiveア != ｱ, if Width is insensitive ア == ｱ.";
+            string sortedKana;
+            if (GlobalizationUtilities.ICUMode())
+            {
+                sortedKana =
+@"using あ;
+using ｱ;
+using ああ;
+using あｱ;
+using ｱあ;
+using ｱｱ;
+using あア;
+using ｱア;
+using ア;
+using アあ;
+using アｱ;
+using アア;";
+            }
+            else
+            {
+                sortedKana =
+@"using ア;
+using ｱ;
+using あ;
+using アア;
+using アｱ;
+using ｱア;
+using ｱｱ;
+using アあ;
+using ｱあ;
+using あア;
+using あｱ;
+using ああ;";
+            }
 
             var final =
-@"using a;
+@$"using a;
 using A;
 using aa;
 using aA;
@@ -1071,21 +1103,8 @@ public async Task CaseSensitivity1()
 using cC;
 using Cc;
 using CC;
-using ア;
-using ｱ;
-using あ;
-using アア;
-using アｱ;
-using ｱア;
-using ｱｱ;
-using アあ;
-using ｱあ;
-using あア;
-using あｱ;
-using ああ;
-
-// If Kana is sensitive あ != ア, if Kana is insensitive あ == ア.
-// If Width is sensitiveア != ｱ, if Width is insensitive ア == ｱ.";
+{sortedKana}
+";
             await CheckAsync(initial, final);
         }
 
@@ -1106,7 +1125,26 @@ public async Task CaseSensitivity2()
 using ｱア;
 using ｱｱ;";
 
-            var final =
+            if (GlobalizationUtilities.ICUMode())
+            {
+                await CheckAsync(initial,
+@"using あ;
+using ｱ;
+using ああ;
+using あｱ;
+using ｱあ;
+using ｱｱ;
+using あア;
+using ｱア;
+using ア;
+using アあ;
+using アｱ;
+using アア;
+");
+            }
+            else
+            {
+                await CheckAsync(initial,
 @"using ア;
 using ｱ;
 using あ;
@@ -1119,9 +1157,8 @@ public async Task CaseSensitivity2()
 using あア;
 using あｱ;
 using ああ;
-";
-
-            await CheckAsync(initial, final);
+");
+            }
         }
 
         [WorkItem(20988, "https://github.com/dotnet/roslyn/issues/20988")]

src/Workspaces/CoreTestUtilities/GlobalizationUtilities.cs

@@ -0,0 +1,26 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System.Globalization;
+
+namespace Microsoft.CodeAnalysis.UnitTests;
+internal class GlobalizationUtilities
+{
+    /// <summary>
+    /// The final ordering of kana depends on what globalization mode is being used.
+    /// On .net framework it is NLS, but on .net core + newer versions of windows, it defers to ICU
+    /// See https://docs.microsoft.com/en-us/dotnet/core/extensions/globalization-icu
+    /// and https://github.com/dotnet/runtime/blob/78065413b2d1b4f0ed26343567379e992a3e26ee/src/libraries/System.Globalization/tests/CompareInfo/CompareInfoTests.cs#L100
+    /// 
+    /// This helper allows us to figure out at runtime which mode is being used so tests can behave accordingly.
+    /// </summary>
+    public static bool ICUMode()
+    {
+        // Copied from https://docs.microsoft.com/en-us/dotnet/core/extensions/globalization-icu#determine-if-your-app-is-using-icu
+        var sortVersion = CultureInfo.InvariantCulture.CompareInfo.Version;
+        var bytes = sortVersion.SortId.ToByteArray();
+        var version = bytes[3] << 24 | bytes[2] << 16 | bytes[1] << 8 | bytes[0];
+        return version != 0 && version == sortVersion.FullVersion;
+    }
+}

src/Workspaces/VisualBasicTest/OrganizeImports/OrganizeImportsTests.vb

@@ -13,6 +13,7 @@ Imports Roslyn.Test.Utilities
 Imports Xunit
 Imports Microsoft.CodeAnalysis.[Shared].Extensions
 Imports Microsoft.CodeAnalysis.OrganizeImports
+Imports Microsoft.CodeAnalysis.UnitTests
 
 Namespace Microsoft.CodeAnalysis.VisualBasic.Workspaces.UnitTests.OrganizeImports
     <[UseExportProvider]>
@@ -673,11 +674,53 @@ Imports Bbb
 Imports cc
 Imports cC
 Imports CC
+</content>
 
-// If Kana is sensitive あ != ア, if Kana is insensitive あ == ア.
-// If Width is sensitiveア != ｱ, if Width is insensitive ア == ｱ.</content>
-
-            Dim final =
+            Dim final As XElement
+            If GlobalizationUtilities.ICUMode() Then
+                final =
+<content>Imports a
+Imports A
+Imports aa
+Imports aA
+Imports Aa
+Imports AA
+Imports b
+Imports B
+Imports bb
+Imports bB
+Imports Bb
+Imports BB
+Imports bbb
+Imports bbB
+Imports bBb
+Imports bBB
+Imports Bbb
+Imports BbB
+Imports BBb
+Imports BBB
+Imports c
+Imports C
+Imports cc
+Imports cC
+Imports cC
+Imports Cc
+Imports CC
+Imports あ
+Imports ｱ
+Imports ああ
+Imports あｱ
+Imports ｱあ
+Imports ｱｱ
+Imports あア
+Imports ｱア
+Imports ア
+Imports アあ
+Imports アｱ
+Imports アア
+</content>
+            Else
+                final =
 <content>Imports a
 Imports A
 Imports aa
@@ -717,9 +760,9 @@ Imports ｱあ
 Imports あア
 Imports あｱ
 Imports ああ
+</content>
+            End If
 
-// If Kana is sensitive あ != ア, if Kana is insensitive あ == ア.
-// If Width is sensitiveア != ｱ, if Width is insensitive ア == ｱ.</content>
             Await CheckAsync(initial, final)
         End Function
 
@@ -739,7 +782,24 @@ Imports ｱあ
 Imports ｱア
 Imports ｱｱ</content>
 
-            Dim final =
+            Dim final As XElement
+            If GlobalizationUtilities.ICUMode() Then
+                final =
+<content>Imports あ
+Imports ｱ
+Imports ああ
+Imports あｱ
+Imports ｱあ
+Imports ｱｱ
+Imports あア
+Imports ｱア
+Imports ア
+Imports アあ
+Imports アｱ
+Imports アア
+</content>
+            Else
+                final =
 <content>Imports ア
 Imports ｱ
 Imports あ
@@ -753,6 +813,7 @@ Imports あア
 Imports あｱ
 Imports ああ
 </content>
+            End If
 
             Await CheckAsync(initial, final)
         End Function