Remove unnecessary msbuild-sdk from global.json (#48599)

* Remove unnecessary msbuild-sdk from global.json

This line was meant to delineate between sdks that were auto-updated by different PRs. But we have since switched to no longer auto-update these SDKs, so there is no reason for this line anymore.

* Reorder so hard-coded entries are in the middle.

diff --git a/global.json b/global.json
index ae674f0..eb29e38 100644 (file)
--- a/global.json
+++ b/global.json
@@ -16,9 +16,8 @@
     "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21105.12",
     "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21105.12",
     "Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.21105.12",
-    "Microsoft.FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0",
-    "Microsoft.NET.Sdk.IL": "6.0.0-preview.2.21115.2",
     "Microsoft.Build.NoTargets": "2.0.17",
-    "Microsoft.Build.Traversal": "2.1.1"
+    "Microsoft.Build.Traversal": "2.1.1",
+    "Microsoft.NET.Sdk.IL": "6.0.0-preview.2.21115.2"
   }
 }