From 4a1644ea206fa051e589b1bd5625f5c285bfec5a Mon Sep 17 00:00:00 2001
From: David Paulson <dpaul@microsoft.com>
Date: Thu, 1 Jul 2021 11:52:42 -0500
Subject: [PATCH 1/2] Included June CUs changes for ad/schema values

---
 .../Checks/Test-ExchangeAdLevel.ps1           | 28 ++++++++++++++++---
 1 file changed, 24 insertions(+), 4 deletions(-)

diff --git a/Setup/SetupAssist/Checks/Test-ExchangeAdLevel.ps1 b/Setup/SetupAssist/Checks/Test-ExchangeAdLevel.ps1
index 6515d7bda7..f3dbbaf473 100644
--- a/Setup/SetupAssist/Checks/Test-ExchangeAdLevel.ps1
+++ b/Setup/SetupAssist/Checks/Test-ExchangeAdLevel.ps1
@@ -78,12 +78,12 @@ function Test-ExchangeAdSetupObjects {
 
     $exchLatest = @{}
     $exchLatest.Add("2016", [PSCustomObject]@{
-            CU         = "CU20"
-            UpperRange = 15333
+            CU         = "CU21"
+            UpperRange = 15334
         })
     $exchLatest.Add("2019", [PSCustomObject]@{
-            CU         = "CU9"
-            UpperRange = 17002
+            CU         = "CU10"
+            UpperRange = 17003
         })
     $exchLatest.Add("2013", [PSCustomObject]@{
             CU         = "CU23"
@@ -185,6 +185,16 @@ function Test-ExchangeAdSetupObjects {
             return
         }
         Write-ReadyFor -ExchangeVersion "2016" -UpperRange $schemaValue -CU $CU
+    } elseif ($schemaValue -eq 15334) {
+
+        if ($MESOValue -eq 13241 -and
+            $orgValue -eq 16221) {
+            $CU = "CU21"
+        } else {
+            Write-Mismatch -ExchVersion "2016" -UpperRange $schemaValue
+            return
+        }
+        Write-ReadyFor -ExchangeVersion "2016" -UpperRange $schemaValue -CU $CU
     }
     #Exchange 2019 CU2+
     elseif ($schemaValue -eq 17001) {
@@ -213,6 +223,16 @@ function Test-ExchangeAdSetupObjects {
             return
         }
         Write-ReadyFor -ExchangeVersion "2016" -UpperRange $schemaValue -CU $CU
+    } elseif ($schemaValue -eq 17003) {
+
+        if ($MESOValue -eq 13241 -and
+            $orgValue -eq 16758) {
+            $CU = "CU10"
+        } else {
+            Write-Mismatch -ExchVersion "2019" -UpperRange $schemaValue
+            return
+        }
+        Write-ReadyFor -ExchangeVersion "2019" -UpperRange $schemaValue -CU $CU
     } else {
         Write-Mismatch -ExchVersion "2019" -UpperRange $schemaValue
     }

From a0de2768a8cfa5ceebbe8ce4b07f784be4e9100b Mon Sep 17 00:00:00 2001
From: David Paulson <dpaul@microsoft.com>
Date: Thu, 1 Jul 2021 11:58:43 -0500
Subject: [PATCH 2/2] Fix bug now display correct Exchange version that we are
 ready for in 2019

---
 Setup/SetupAssist/Checks/Test-ExchangeAdLevel.ps1 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Setup/SetupAssist/Checks/Test-ExchangeAdLevel.ps1 b/Setup/SetupAssist/Checks/Test-ExchangeAdLevel.ps1
index f3dbbaf473..f3e95750f2 100644
--- a/Setup/SetupAssist/Checks/Test-ExchangeAdLevel.ps1
+++ b/Setup/SetupAssist/Checks/Test-ExchangeAdLevel.ps1
@@ -209,7 +209,7 @@ function Test-ExchangeAdSetupObjects {
             Write-Mismatch -ExchVersion "2019" -UpperRange $schemaValue
             return
         }
-        Write-ReadyFor -ExchangeVersion "2016" -UpperRange $schemaValue -CU $CU
+        Write-ReadyFor -ExchangeVersion "2019" -UpperRange $schemaValue -CU $CU
     } elseif ($schemaValue -eq 17002) {
 
         if ($MESOValue -eq 13239 -and
@@ -222,7 +222,7 @@ function Test-ExchangeAdSetupObjects {
             Write-Mismatch -ExchVersion "2019" -UpperRange $schemaValue
             return
         }
-        Write-ReadyFor -ExchangeVersion "2016" -UpperRange $schemaValue -CU $CU
+        Write-ReadyFor -ExchangeVersion "2019" -UpperRange $schemaValue -CU $CU
     } elseif ($schemaValue -eq 17003) {
 
         if ($MESOValue -eq 13241 -and