From 1d2e21a26d4c1ba2ea37ef135aaa95f168491278 Mon Sep 17 00:00:00 2001
From: Sima Zhu <sizhu@microsoft.com>
Date: Wed, 13 Oct 2021 22:27:36 -0700
Subject: [PATCH 1/5] Add group id into metadata for java use

---
 eng/common/scripts/Update-DocsMsPackages.ps1 | 1 +
 1 file changed, 1 insertion(+)

diff --git a/eng/common/scripts/Update-DocsMsPackages.ps1 b/eng/common/scripts/Update-DocsMsPackages.ps1
index 562cc307bef5..a0f5fd8bab07 100644
--- a/eng/common/scripts/Update-DocsMsPackages.ps1
+++ b/eng/common/scripts/Update-DocsMsPackages.ps1
@@ -61,6 +61,7 @@ function GetDocsMetadataForMoniker($moniker) {
       RepoPath = $fileObject.ServiceDirectory;
       Type = $fileObject.SdkType;
       New = $fileObject.IsNewSdk;
+      GroupId = $fileObject.Gruop;
     }
   }
 

From 715d5c7cde27f4cb27e8da121867ec56267918a0 Mon Sep 17 00:00:00 2001
From: Sima Zhu <48036328+sima-zhu@users.noreply.github.com>
Date: Thu, 14 Oct 2021 11:53:55 -0700
Subject: [PATCH 2/5] Update Update-DocsMsPackages.ps1

---
 eng/common/scripts/Update-DocsMsPackages.ps1 | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/eng/common/scripts/Update-DocsMsPackages.ps1 b/eng/common/scripts/Update-DocsMsPackages.ps1
index a0f5fd8bab07..163b236383fe 100644
--- a/eng/common/scripts/Update-DocsMsPackages.ps1
+++ b/eng/common/scripts/Update-DocsMsPackages.ps1
@@ -54,14 +54,18 @@ function GetDocsMetadataForMoniker($moniker) {
       $versionPreview = $fileObject.Version
     }
 
-    $metadata += @{ 
+    $entry += @{ 
       Package = $fileObject.Name; 
       VersionGA = $versionGa;
       VersionPreview = $versionPreview;
       RepoPath = $fileObject.ServiceDirectory;
       Type = $fileObject.SdkType;
       New = $fileObject.IsNewSdk;
-      GroupId = $fileObject.Gruop;
+    }
+    $metadata += $entry
+    if ($fileObject.PSObject.Members.Name -contains "Group")
+    {
+      $entry.Add("GroupId", $fileObject.Gruop)
     }
   }
 

From 417355ec2ca600ee5a212dd2991b5fcd1f61abb0 Mon Sep 17 00:00:00 2001
From: Sima Zhu <48036328+sima-zhu@users.noreply.github.com>
Date: Thu, 14 Oct 2021 11:55:01 -0700
Subject: [PATCH 3/5] Update Update-DocsMsPackages.ps1

---
 eng/common/scripts/Update-DocsMsPackages.ps1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/common/scripts/Update-DocsMsPackages.ps1 b/eng/common/scripts/Update-DocsMsPackages.ps1
index 163b236383fe..7b5a67b5df82 100644
--- a/eng/common/scripts/Update-DocsMsPackages.ps1
+++ b/eng/common/scripts/Update-DocsMsPackages.ps1
@@ -62,11 +62,11 @@ function GetDocsMetadataForMoniker($moniker) {
       Type = $fileObject.SdkType;
       New = $fileObject.IsNewSdk;
     }
-    $metadata += $entry
     if ($fileObject.PSObject.Members.Name -contains "Group")
     {
       $entry.Add("GroupId", $fileObject.Gruop)
     }
+    $metadata += $entry
   }
 
   return $metadata

From 00c78b8c3a44b84cf236d609f85a15f432777a97 Mon Sep 17 00:00:00 2001
From: Sima Zhu <48036328+sima-zhu@users.noreply.github.com>
Date: Mon, 18 Oct 2021 09:43:11 -0700
Subject: [PATCH 4/5] Update eng/common/scripts/Update-DocsMsPackages.ps1

Co-authored-by: Ben Broderick Phillips <ben@benbp.net>
---
 eng/common/scripts/Update-DocsMsPackages.ps1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/common/scripts/Update-DocsMsPackages.ps1 b/eng/common/scripts/Update-DocsMsPackages.ps1
index 7b5a67b5df82..a392e4047682 100644
--- a/eng/common/scripts/Update-DocsMsPackages.ps1
+++ b/eng/common/scripts/Update-DocsMsPackages.ps1
@@ -54,7 +54,7 @@ function GetDocsMetadataForMoniker($moniker) {
       $versionPreview = $fileObject.Version
     }
 
-    $entry += @{ 
+    $entry = @{
       Package = $fileObject.Name; 
       VersionGA = $versionGa;
       VersionPreview = $versionPreview;

From 966263db34d2af120e64f677bcd0a4849c43886c Mon Sep 17 00:00:00 2001
From: Sima Zhu <48036328+sima-zhu@users.noreply.github.com>
Date: Mon, 18 Oct 2021 09:43:33 -0700
Subject: [PATCH 5/5] Update eng/common/scripts/Update-DocsMsPackages.ps1

Co-authored-by: Ben Broderick Phillips <ben@benbp.net>
---
 eng/common/scripts/Update-DocsMsPackages.ps1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/common/scripts/Update-DocsMsPackages.ps1 b/eng/common/scripts/Update-DocsMsPackages.ps1
index a392e4047682..7b957c884765 100644
--- a/eng/common/scripts/Update-DocsMsPackages.ps1
+++ b/eng/common/scripts/Update-DocsMsPackages.ps1
@@ -64,7 +64,7 @@ function GetDocsMetadataForMoniker($moniker) {
     }
     if ($fileObject.PSObject.Members.Name -contains "Group")
     {
-      $entry.Add("GroupId", $fileObject.Gruop)
+      $entry.Add("GroupId", $fileObject.Group)
     }
     $metadata += $entry
   }