Upgraded the virtual machines DC and SharePoint Subscription to Windo…

…ws Server 2025
Yvand · Jan 7, 2025 · 49eac5b · 49eac5b
1 parent cf59462
commit 49eac5b
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 12 deletions.
diff --git a/Azure Resource Manager/SharePoint-ADFS/.vscode/tasks.json b/Azure Resource Manager/SharePoint-ADFS/.vscode/tasks.json
@@ -21,7 +21,7 @@
             }
         },
         {
-            "label": "deploy template",
+            "label": "deploy bicep template",
             "type": "shell",
             "command": "${workspaceFolder}/DeployTemplate.ps1",
             "args": [

diff --git a/Azure Resource Manager/SharePoint-ADFS/CHANGELOG.md b/Azure Resource Manager/SharePoint-ADFS/CHANGELOG.md
@@ -7,6 +7,9 @@
 - Template
   - Enabled [Trusted launch](https://learn.microsoft.com/azure/virtual-machines/trusted-launch-existing-vm), with secure boot and Virtual Trusted Platform Module, on all virtual machines except SharePoint 2016
   - Added parameter `addNameToPublicIpAddresses`, to decide which virtual machines should have a public name associated to their public IP address. Default value is to add it to SharePoint virtual machines only.
+  - Upgraded the virtual machines DC and SharePoint Subscription to Windows Server 2025.
+- DSC Configuration for SPSE
+  - Renamed root site to "root site"
 
 ## Enhancements & bug-fixes - Published in December 18, 2024
 

diff --git a/Azure Resource Manager/SharePoint-ADFS/azuredeploy.json b/Azure Resource Manager/SharePoint-ADFS/azuredeploy.json
@@ -5,7 +5,7 @@
     "_generator": {
       "name": "bicep",
       "version": "0.32.4.45862",
-      "templateHash": "4053973462288116100"
+      "templateHash": "1915767330906925736"
     },
     "description": "Create a DC, a SQL Server 2022, and from 1 to 5 server(s) hosting a SharePoint Subscription / 2019 / 2016 farm with an extensive configuration, including trusted authentication, user profiles with personal sites, an OAuth trust (using a certificate), a dedicated IIS site for hosting high-trust add-ins, etc... The latest version of key softwares (including Fiddler, vscode, np++, 7zip, ULS Viewer) is installed. SharePoint machines have additional fine-tuning to make them immediately usable (remote administration tools, custom policies for Edge and Chrome, shortcuts, etc...).",
     "author": "Yvand"
@@ -371,7 +371,7 @@
     "sharePointSettings": {
       "isSharePointSubscription": "[if(startsWith(parameters('sharePointVersion'), 'subscription'), true(), false())]",
       "sharePointImagesList": {
-        "Subscription": "MicrosoftWindowsServer:WindowsServer:2022-datacenter-azure-edition:latest",
+        "Subscription": "MicrosoftWindowsServer:WindowsServer:2025-datacenter-azure-edition:latest",
         "sp2019": "MicrosoftSharePoint:MicrosoftSharePointServer:sp2019gen2smalldisk:latest",
         "sp2016": "MicrosoftSharePoint:MicrosoftSharePointServer:sp2016:latest"
       },
@@ -475,7 +475,7 @@
       "vmSQLName": "SQL",
       "vmSPName": "SP",
       "vmFEName": "FE",
-      "vmDCImage": "MicrosoftWindowsServer:WindowsServer:2022-datacenter-azure-edition-smalldisk:latest",
+      "vmDCImage": "MicrosoftWindowsServer:WindowsServer:2025-datacenter-azure-edition-smalldisk:latest",
       "vmSQLImage": "MicrosoftSQLServer:sql2022-ws2022:sqldev-gen2:latest",
       "vmSharePointImage": "[if(variables('sharePointSettings').isSharePointSubscription, variables('sharePointSettings').sharePointImagesList.Subscription, if(equals(parameters('sharePointVersion'), '2019'), variables('sharePointSettings').sharePointImagesList.sp2019, variables('sharePointSettings').sharePointImagesList.sp2016))]",
       "vmSharePointSecurityProfile": "[if(equals(parameters('sharePointVersion'), '2016'), null(), createObject('securityType', 'TrustedLaunch', 'uefiSettings', createObject('secureBootEnabled', true(), 'vTpmEnabled', true())))]"
@@ -657,7 +657,7 @@
             "enableAutomaticUpdates": "[variables('vmsSettings').enableAutomaticUpdates]",
             "provisionVMAgent": true,
             "patchSettings": {
-              "patchMode": "[if(variables('vmsSettings').enableAutomaticUpdates, 'AutomaticByOS', 'Manual')]",
+              "patchMode": "[if(variables('vmsSettings').enableAutomaticUpdates, 'AutomaticByPlatform', 'Manual')]",
               "assessmentMode": "ImageDefault"
             }
           }
@@ -1061,7 +1061,7 @@
             "enableAutomaticUpdates": "[variables('vmsSettings').enableAutomaticUpdates]",
             "provisionVMAgent": true,
             "patchSettings": {
-              "patchMode": "[if(variables('vmsSettings').enableAutomaticUpdates, 'AutomaticByOS', 'Manual')]",
+              "patchMode": "[if(variables('vmsSettings').enableAutomaticUpdates, if(variables('sharePointSettings').isSharePointSubscription, 'AutomaticByPlatform', 'AutomaticByOS'), 'Manual')]",
               "assessmentMode": "ImageDefault"
             }
           }
@@ -1320,7 +1320,7 @@
             "enableAutomaticUpdates": "[variables('vmsSettings').enableAutomaticUpdates]",
             "provisionVMAgent": true,
             "patchSettings": {
-              "patchMode": "[if(variables('vmsSettings').enableAutomaticUpdates, 'AutomaticByOS', 'Manual')]",
+              "patchMode": "[if(variables('vmsSettings').enableAutomaticUpdates, if(variables('sharePointSettings').isSharePointSubscription, 'AutomaticByPlatform', 'AutomaticByOS'), 'Manual')]",
               "assessmentMode": "ImageDefault"
             }
           }

diff --git a/Azure Resource Manager/SharePoint-ADFS/main.bicep b/Azure Resource Manager/SharePoint-ADFS/main.bicep
@@ -290,7 +290,7 @@ var resourceGroupNameFormatted = replace(
 var sharePointSettings = {
   isSharePointSubscription: (startsWith(sharePointVersion, 'subscription') ? true : false)
   sharePointImagesList: {
-    Subscription: 'MicrosoftWindowsServer:WindowsServer:2022-datacenter-azure-edition:latest'
+    Subscription: 'MicrosoftWindowsServer:WindowsServer:2025-datacenter-azure-edition:latest'
     sp2019: 'MicrosoftSharePoint:MicrosoftSharePointServer:sp2019gen2smalldisk:latest'
     sp2016: 'MicrosoftSharePoint:MicrosoftSharePointServer:sp2016:latest'
   }
@@ -395,7 +395,7 @@ var vmsSettings = {
   vmSQLName: 'SQL'
   vmSPName: 'SP'
   vmFEName: 'FE'
-  vmDCImage: 'MicrosoftWindowsServer:WindowsServer:2022-datacenter-azure-edition-smalldisk:latest'
+  vmDCImage: 'MicrosoftWindowsServer:WindowsServer:2025-datacenter-azure-edition-smalldisk:latest'
   vmSQLImage: 'MicrosoftSQLServer:sql2022-ws2022:sqldev-gen2:latest'
   vmSharePointImage: (sharePointSettings.isSharePointSubscription
     ? sharePointSettings.sharePointImagesList.Subscription
@@ -595,7 +595,7 @@ resource vm_dc_def 'Microsoft.Compute/virtualMachines@2024-07-01' = {
         enableAutomaticUpdates: vmsSettings.enableAutomaticUpdates
         provisionVMAgent: true
         patchSettings: {
-          patchMode: (vmsSettings.enableAutomaticUpdates ? 'AutomaticByOS' : 'Manual')
+          patchMode: (vmsSettings.enableAutomaticUpdates ? 'AutomaticByPlatform' : 'Manual')
           assessmentMode: 'ImageDefault'
         }
       }
@@ -975,7 +975,9 @@ resource vm_sp_def 'Microsoft.Compute/virtualMachines@2024-07-01' = {
         enableAutomaticUpdates: vmsSettings.enableAutomaticUpdates
         provisionVMAgent: true
         patchSettings: {
-          patchMode: (vmsSettings.enableAutomaticUpdates ? 'AutomaticByOS' : 'Manual')
+          patchMode: (vmsSettings.enableAutomaticUpdates
+            ? sharePointSettings.isSharePointSubscription ? 'AutomaticByPlatform' : 'AutomaticByOS'
+            : 'Manual')
           assessmentMode: 'ImageDefault'
         }
       }
@@ -1215,7 +1217,9 @@ resource vm_fe_def 'Microsoft.Compute/virtualMachines@2024-07-01' = [
           enableAutomaticUpdates: vmsSettings.enableAutomaticUpdates
           provisionVMAgent: true
           patchSettings: {
-            patchMode: (vmsSettings.enableAutomaticUpdates ? 'AutomaticByOS' : 'Manual')
+            patchMode: (vmsSettings.enableAutomaticUpdates
+              ? sharePointSettings.isSharePointSubscription ? 'AutomaticByPlatform' : 'AutomaticByOS'
+              : 'Manual')
             assessmentMode: 'ImageDefault'
           }
         }