From fdd4bc11f9662cafcdc1517562bccbd53f5bfd31 Mon Sep 17 00:00:00 2001
From: Julian Bayardo <jubayard@microsoft.com>
Date: Wed, 8 Nov 2023 23:47:28 +0000
Subject: [PATCH] Merged PR 750711: Revert "Merged PR 747309: Upgrade
 Azure.Identity to 1.10.2

Revert "Merged PR 747309: Upgrade Azure.Identity to 1.10.2

Upgrades some dependent packages and removes a few unused ones

Related work items: #2115829"

Reverted commit `57b2faf4`.

Related work items: #2115829
---
 cg/nuget/cgmanifest.json | 28 +++++++++++++++++++++++-----
 config.dsc               | 14 ++++++++------
 2 files changed, 31 insertions(+), 11 deletions(-)

diff --git a/cg/nuget/cgmanifest.json b/cg/nuget/cgmanifest.json
index 4a79713b8..8c8cbec87 100644
--- a/cg/nuget/cgmanifest.json
+++ b/cg/nuget/cgmanifest.json
@@ -60,7 +60,7 @@
         "Type": "NuGet",
         "NuGet": {
           "Name": "Azure.Core",
-          "Version": "1.35.0"
+          "Version": "1.34.0"
         }
       }
     },
@@ -87,7 +87,7 @@
         "Type": "NuGet",
         "NuGet": {
           "Name": "Azure.Identity",
-          "Version": "1.10.2"
+          "Version": "1.10.0"
         }
       }
     },
@@ -1356,7 +1356,7 @@
         "Type": "NuGet",
         "NuGet": {
           "Name": "Microsoft.Identity.Client",
-          "Version": "4.56.0"
+          "Version": "4.55.0"
         }
       }
     },
@@ -1374,7 +1374,7 @@
         "Type": "NuGet",
         "NuGet": {
           "Name": "Microsoft.Identity.Client.Extensions.Msal",
-          "Version": "4.56.0"
+          "Version": "2.32.0"
         }
       }
     },
@@ -2976,7 +2976,16 @@
         "Type": "NuGet",
         "NuGet": {
           "Name": "System.Diagnostics.DiagnosticSource",
-          "Version": "7.0.2"
+          "Version": "4.0.0-beta-23516"
+        }
+      }
+    },
+    {
+      "Component": {
+        "Type": "NuGet",
+        "NuGet": {
+          "Name": "System.Diagnostics.DiagnosticSource",
+          "Version": "4.6.0"
         }
       }
     },
@@ -3637,6 +3646,15 @@
         }
       }
     },
+    {
+      "Component": {
+        "Type": "NuGet",
+        "NuGet": {
+          "Name": "System.Runtime.CompilerServices.Unsafe",
+          "Version": "4.5.3"
+        }
+      }
+    },
     {
       "Component": {
         "Type": "NuGet",
diff --git a/config.dsc b/config.dsc
index 3823e6af2..48937ba97 100644
--- a/config.dsc
+++ b/config.dsc
@@ -72,8 +72,9 @@ config({
 
                 { id: "Microsoft.NETFramework.ReferenceAssemblies.net472", version: "1.0.0" },
 
-                { id: "System.Diagnostics.DiagnosticSource", version: "7.0.2",
+                { id: "System.Diagnostics.DiagnosticSource", version: "4.6.0",
                     dependentPackageIdsToSkip: ["System.Memory"] },
+                { id: "System.Diagnostics.DiagnosticSource", version: "4.0.0-beta-23516", alias: "System.Diagnostics.DiagnosticsSource.ForEventHub"},
 
                 // Roslyn
                 // The old compiler used by integration tests only.
@@ -189,11 +190,11 @@ config({
                 // Key Vault
                 { id: "Azure.Security.KeyVault.Secrets", version: "4.5.0" },
                 { id: "Azure.Security.KeyVault.Certificates", version: "4.5.1" },
-                { id: "Azure.Identity", version: "1.10.2" },
-                { id: "Microsoft.Identity.Client", version: "4.56.0" },
+                { id: "Azure.Identity", version: "1.10.0" },
+                { id: "Microsoft.Identity.Client", version: "4.55.0" },
                 { id: "Microsoft.IdentityModel.Abstractions", version: "6.32.1" },
-                { id: "Microsoft.Identity.Client.Extensions.Msal", version: "4.56.0" },
-                { id: "Azure.Core", version: "1.35.0", 
+                { id: "Microsoft.Identity.Client.Extensions.Msal", version: "2.32.0" },
+                { id: "Azure.Core", version: "1.34.0", 
                     dependentPackageIdsToSkip: ["System.Buffers", "System.Text.Encodings.Web", "System.Text.Json", "System.Memory", "System.Memory.Data", "System.Numerics.Vectors", "Microsoft.Bcl.AsyncInterfaces" ] },
                 { id: "System.Memory.Data", version: "1.0.2",
                     dependentPackageIdsToSkip: [ "System.Memory", "System.Text.Json" ] },
@@ -330,7 +331,8 @@ config({
                 { id: "System.CodeDom", version: "4.4.0"},
                 { id: "System.Text.Encoding.CodePages", version: "4.5.1",
                     dependentPackageIdsToSkip: ["System.Runtime.CompilerServices.Unsafe"]},
-                { id: "System.Numerics.Vectors", version: "4.4.0", alias: "SystemNumericsVectorsForMSBuild"},
+                { id: "System.Runtime.CompilerServices.Unsafe", version: "4.5.3", alias: "SystemRuntimeCompilerServicesUnsafeForMSBuild", dependentPackageIdsToSkip: ["*"]},
+                {id: "System.Numerics.Vectors", version: "4.4.0", alias: "SystemNumericsVectorsForMSBuild"},
 
                 // Used for MSBuild input/output prediction
                 { id: "Microsoft.Build.Prediction", version: "0.3.0" },