From ae21deabaf9617e3963af0aee359784d69fe8526 Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Mon, 25 Sep 2023 17:12:08 -0700
Subject: [PATCH] Updates RIDs used to generate component Inventory (#20370)

---
 tools/cgmanifest.json        | 16 ++++++++--------
 tools/findMissingNotices.ps1 |  9 ++++-----
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/tools/cgmanifest.json b/tools/cgmanifest.json
index f52550c61ce..741ae0cbf52 100644
--- a/tools/cgmanifest.json
+++ b/tools/cgmanifest.json
@@ -35,7 +35,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "Json.More.Net",
-          "Version": "1.8.0"
+          "Version": "1.9.0"
         }
       },
       "DevelopmentDependency": false
@@ -45,7 +45,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "JsonPointer.Net",
-          "Version": "3.0.1"
+          "Version": "3.0.3"
         }
       },
       "DevelopmentDependency": false
@@ -55,7 +55,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "JsonSchema.Net",
-          "Version": "4.1.8"
+          "Version": "5.2.5"
         }
       },
       "DevelopmentDependency": false
@@ -65,7 +65,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "Markdig.Signed",
-          "Version": "0.31.0"
+          "Version": "0.33.0"
         }
       },
       "DevelopmentDependency": false
@@ -105,7 +105,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "Microsoft.CodeAnalysis.Common",
-          "Version": "4.6.0"
+          "Version": "4.7.0"
         }
       },
       "DevelopmentDependency": false
@@ -115,7 +115,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "Microsoft.CodeAnalysis.CSharp",
-          "Version": "4.6.0"
+          "Version": "4.7.0"
         }
       },
       "DevelopmentDependency": false
@@ -225,7 +225,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "Microsoft.Windows.Compatibility",
-          "Version": "7.0.4"
+          "Version": "7.0.5"
         }
       },
       "DevelopmentDependency": false
@@ -475,7 +475,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "System.DirectoryServices.AccountManagement",
-          "Version": "7.0.0"
+          "Version": "7.0.1"
         }
       },
       "DevelopmentDependency": false
diff --git a/tools/findMissingNotices.ps1 b/tools/findMissingNotices.ps1
index e267f718a33..6e372c0ede9 100644
--- a/tools/findMissingNotices.ps1
+++ b/tools/findMissingNotices.ps1
@@ -165,10 +165,9 @@ function Get-CGRegistrations {
             "linux-x64",
             "osx-arm64",
             "osx-x64",
-            "win-arm",
             "win-arm64",
-            "win7-x64",
-            "win7-x86",
+            "win-x64",
+            "win-x86",
             "modules")]
         [string]$Runtime,
 
@@ -197,7 +196,7 @@ function Get-CGRegistrations {
             $folder = $unixProjectName
             $target = "$dotnetTargetName|$Runtime"
         }
-        "win7-.*" {
+        "win-x*" {
             $sdkToUse = $winDesktopSdk
             $folder = $windowsProjectName
             $target = "$dotnetTargetNameWin7|$Runtime"
@@ -265,7 +264,7 @@ function Get-CGRegistrations {
 $registrations = [System.Collections.Generic.Dictionary[string, Registration]]::new()
 $lastCount = 0
 $registrationChanged = $false
-foreach ($runtime in "win7-x64", "linux-x64", "osx-x64", "linux-musl-x64", "win-arm", "linux-arm", "linux-arm64", "osx-arm64", "win-arm64", "win7-x86") {
+foreach ($runtime in "win-x64", "linux-x64", "osx-x64", "linux-musl-x64", "linux-arm", "linux-arm64", "osx-arm64", "win-arm64", "win-x86") {
     $registrationChanged = (Get-CGRegistrations -Runtime $runtime -RegistrationTable $registrations) -or $registrationChanged
     $count = $registrations.Count
     $newCount = $count - $lastCount