From 09d15dd9aa15bbcb14530b9939b6e09af7c02ba3 Mon Sep 17 00:00:00 2001
From: Patrick Meinecke <pmeinecke@microsoft.com>
Date: Tue, 9 Apr 2024 21:16:40 +0000
Subject: [PATCH] Merged PR 30709: Update SDK, deps and cgmanifest for 7.3.12

---
 global.json                                               | 2 +-
 .../Microsoft.PowerShell.SDK.csproj                       | 2 +-
 .../System.Management.Automation.csproj                   | 2 +-
 tools/cgmanifest.json                                     | 8 ++++----
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/global.json b/global.json
index e0a78764fe..4f11909ff2 100644
--- a/global.json
+++ b/global.json
@@ -1,5 +1,5 @@
 {
   "sdk": {
-    "version": "7.0.407"
+    "version": "7.0.408"
   }
 }
diff --git a/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj b/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj
index 0894003c92..76d62906f3 100644
--- a/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj
+++ b/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj
@@ -17,7 +17,7 @@
   <ItemGroup>
     <!-- This section is to force the version of non-direct dependencies -->
     <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="7.0.0" />
-    <PackageReference Include="Microsoft.Extensions.ObjectPool" Version="7.0.17" />
+    <PackageReference Include="Microsoft.Extensions.ObjectPool" Version="7.0.18" />
     <PackageReference Include="Microsoft.Win32.Registry" Version="5.0.0" />
     <PackageReference Include="System.Security.Cryptography.ProtectedData" Version="7.0.1" />
     <PackageReference Include="System.Security.Cryptography.Xml" Version="7.0.1" />
diff --git a/src/System.Management.Automation/System.Management.Automation.csproj b/src/System.Management.Automation/System.Management.Automation.csproj
index 5f6dd5ea79..c14b90cce7 100644
--- a/src/System.Management.Automation/System.Management.Automation.csproj
+++ b/src/System.Management.Automation/System.Management.Automation.csproj
@@ -26,7 +26,7 @@
     <PackageReference Include="System.DirectoryServices" Version="7.0.1" />
     <!--PackageReference Include="System.IO.FileSystem.AccessControl" Version="6.0.0-preview.5.21301.5" /-->
     <PackageReference Include="System.Management" Version="7.0.2" />
-    <PackageReference Include="System.Security.AccessControl" Version="6.0.0" />
+    <PackageReference Include="System.Security.AccessControl" Version="6.0.1" />
     <PackageReference Include="System.Security.Cryptography.Pkcs" Version="7.0.3" />
     <PackageReference Include="System.Security.Cryptography.ProtectedData" Version="7.0.1" />
     <PackageReference Include="System.Security.Permissions" Version="7.0.0" />
diff --git a/tools/cgmanifest.json b/tools/cgmanifest.json
index ac37572b5d..0a1e70f84b 100644
--- a/tools/cgmanifest.json
+++ b/tools/cgmanifest.json
@@ -1,4 +1,5 @@
 {
+  "$schema": "https://json.schemastore.org/component-detection-manifest.json",
   "Registrations": [
     {
       "Component": {
@@ -105,7 +106,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "Microsoft.Extensions.ObjectPool",
-          "Version": "7.0.17"
+          "Version": "7.0.18"
         }
       },
       "DevelopmentDependency": false
@@ -645,7 +646,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "System.Security.AccessControl",
-          "Version": "6.0.0"
+          "Version": "6.0.1"
         }
       },
       "DevelopmentDependency": false
@@ -840,6 +841,5 @@
       },
       "DevelopmentDependency": false
     }
-  ],
-  "$schema": "https://json.schemastore.org/component-detection-manifest.json"
+  ]
 }