From 7660dff2a5735b9aee30c5ce09d3e8446455da14 Mon Sep 17 00:00:00 2001
From: Deep Modh <demodh@microsoft.com>
Date: Wed, 1 Feb 2023 17:01:31 -0800
Subject: [PATCH 1/2] added support for windows 2022 server

---
 src/ServiceFabric/ServiceFabric/ChangeLog.md                  | 2 ++
 .../ServiceFabric/Commands/NewAzureRmServiceFabricCluster.cs  | 4 +++-
 src/ServiceFabric/ServiceFabric/Models/OperatingSystem.cs     | 3 ++-
 .../ServiceFabric/help/New-AzServiceFabricCluster.md          | 2 +-
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/ServiceFabric/ServiceFabric/ChangeLog.md b/src/ServiceFabric/ServiceFabric/ChangeLog.md
index 4b1ce22fc033..0dc37e991e9b 100644
--- a/src/ServiceFabric/ServiceFabric/ChangeLog.md
+++ b/src/ServiceFabric/ServiceFabric/ChangeLog.md
@@ -18,6 +18,8 @@
         - Additional information about change #1
 -->
 ## Upcoming Release
+* Added support for Windows 2022 server vm image. 
+    - This enables cluster operations with Windows 2022 server vm image using AZ powershell. 
 
 ## Version 3.1.0
 * Fixed typo in verbose log message.
diff --git a/src/ServiceFabric/ServiceFabric/Commands/NewAzureRmServiceFabricCluster.cs b/src/ServiceFabric/ServiceFabric/Commands/NewAzureRmServiceFabricCluster.cs
index 2e95c19fcf97..629e7177d61c 100644
--- a/src/ServiceFabric/ServiceFabric/Commands/NewAzureRmServiceFabricCluster.cs
+++ b/src/ServiceFabric/ServiceFabric/Commands/NewAzureRmServiceFabricCluster.cs
@@ -48,7 +48,8 @@ public class NewAzureRmServiceFabricCluster : ServiceFabricClusterCertificateCmd
             {OperatingSystem.UbuntuServer1804, "18.04-LTS"},
             {OperatingSystem.UbuntuServer2004, "20_04-LTS"},
             {OperatingSystem.WindowsServer2016DatacenterwithContainers, "2016-Datacenter-with-Containers"},
-            {OperatingSystem.WindowsServer2016Datacenter, "2016-Datacenter"}
+            {OperatingSystem.WindowsServer2016Datacenter, "2016-Datacenter"},
+            {OperatingSystem.WindowsServer2022, "2022-datacenter-azure-edition"}
         };
 
         private string resourceLocation;
@@ -442,6 +443,7 @@ private void DeployWithDefaultTemplate()
                     case OperatingSystem.WindowsServer2012R2Datacenter:
                     case OperatingSystem.WindowsServer2016Datacenter:
                     case OperatingSystem.WindowsServer2016DatacenterwithContainers:
+                    case OperatingSystem.WindowsServer2022:
                         osRelativePath = Constants.WindowsTemplateRelativePath;
                         break;
                     case OperatingSystem.UbuntuServer1604:
diff --git a/src/ServiceFabric/ServiceFabric/Models/OperatingSystem.cs b/src/ServiceFabric/ServiceFabric/Models/OperatingSystem.cs
index 205fb276b678..d629a8e55818 100644
--- a/src/ServiceFabric/ServiceFabric/Models/OperatingSystem.cs
+++ b/src/ServiceFabric/ServiceFabric/Models/OperatingSystem.cs
@@ -21,6 +21,7 @@ public enum OperatingSystem
         WindowsServer2016DatacenterwithContainers,
         UbuntuServer1604,
         UbuntuServer1804,
-        UbuntuServer2004
+        UbuntuServer2004,
+        WindowsServer2022
     }
 }
diff --git a/src/ServiceFabric/ServiceFabric/help/New-AzServiceFabricCluster.md b/src/ServiceFabric/ServiceFabric/help/New-AzServiceFabricCluster.md
index 5e62b1dc050d..29f176ec31e1 100644
--- a/src/ServiceFabric/ServiceFabric/help/New-AzServiceFabricCluster.md
+++ b/src/ServiceFabric/ServiceFabric/help/New-AzServiceFabricCluster.md
@@ -322,7 +322,7 @@ The Operating System of the VMs that make up the cluster.
 Type: Microsoft.Azure.Commands.ServiceFabric.Models.OperatingSystem
 Parameter Sets: ByDefaultArmTemplate
 Aliases: VmImage
-Accepted values: WindowsServer2012R2Datacenter, WindowsServer2016Datacenter, WindowsServer2016DatacenterwithContainers, UbuntuServer1604, UbuntuServer1804, UbuntuServer2004
+Accepted values: WindowsServer2012R2Datacenter, WindowsServer2016Datacenter, WindowsServer2016DatacenterwithContainers, UbuntuServer1604, UbuntuServer1804, UbuntuServer2004, WindowsServer2022
 
 Required: False
 Position: Named

From f5277fec019a35f6d964df60e7bc35caa279a535 Mon Sep 17 00:00:00 2001
From: Deep Modh <demodh@microsoft.com>
Date: Tue, 7 Feb 2023 13:14:57 -0800
Subject: [PATCH 2/2] updated changelog file based on comments

---
 src/ServiceFabric/ServiceFabric/ChangeLog.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/ServiceFabric/ServiceFabric/ChangeLog.md b/src/ServiceFabric/ServiceFabric/ChangeLog.md
index 0dc37e991e9b..eea062a68f0b 100644
--- a/src/ServiceFabric/ServiceFabric/ChangeLog.md
+++ b/src/ServiceFabric/ServiceFabric/ChangeLog.md
@@ -19,7 +19,7 @@
 -->
 ## Upcoming Release
 * Added support for Windows 2022 server vm image. 
-    - This enables cluster operations with Windows 2022 server vm image using AZ powershell. 
+    - This enables cluster operations with Windows 2022 server vm image 
 
 ## Version 3.1.0
 * Fixed typo in verbose log message.