Merge branch 'dev' of https://github.com/microsoft/MSLab into dev

microsoft · Mar 22, 2024 · b793a16 · b793a16
2 parents cc75212 + 4cebf33
commit b793a16
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 18 deletions.
diff --git a/.github/workflows/create-prerelase.yml b/.github/workflows/create-prerelase.yml
@@ -16,6 +16,9 @@ jobs:
     name: Create prerelease
     if: "!contains(github.event.head_commit.message, '[no release]')"
     runs-on: windows-2019
+    permissions:
+      # needed to create a release
+      contents: write
     steps:
       - uses: actions/checkout@v3
         with:

diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml
@@ -17,6 +17,9 @@ jobs:
     name: Bump version
     if: "!contains(github.event.head_commit.message, '[no release]')"
     runs-on: windows-2019
+    permissions:
+      # needed to create a release
+      contents: write 
     outputs:
       previous_tag: ${{ steps.bump.outputs.previous_tag }}
       new_tag: ${{ steps.bump.outputs.new_tag }}
@@ -52,6 +55,9 @@ jobs:
     name: Create release
     if: "!contains(github.event.head_commit.message, '[no release]')"
     runs-on: self-hosted
+    permissions:
+      # needed to create a release
+      contents: write 
     needs: new-version
     steps:
       - uses: actions/checkout@v3

diff --git a/Scripts/2_CreateParentDisks.ps1 b/Scripts/2_CreateParentDisks.ps1
@@ -16,7 +16,7 @@ If (-not $isAdmin) {
 . $PSScriptRoot\0_Shared.ps1 # [!build-include-inline]
 
     #Create Unattend for VHD
-    Function CreateUnattendFileVHD{
+    Function CreateUnattendFileVHD {
         param (
             [parameter(Mandatory=$true)]
             [string]
@@ -1239,4 +1239,4 @@ If (!$LabConfig.AutoClosePSWindows) {
     Read-Host | Out-Null
 }
 
-#endregion
+#endregion
diff --git a/Tools/DownloadLatestCUs.ps1 b/Tools/DownloadLatestCUs.ps1
@@ -39,16 +39,18 @@ if ($version.Minor -eq 27){
 }
 
 $Products=@()
-$Products+=@{Product="Azure Stack HCI 22H2"                         ;SearchString="Cumulative Update for Microsoft server operating system, version 22H2 for x64-based Systems" ;SSUSearchString="Servicing Stack Update for Microsoft server operating system version 22H2 for x64-based Systems" ; ID="Microsoft Server operating system-22H2"}
-$Products+=@{Product="Azure Stack HCI 21H2 and Windows Server 2022" ;SearchString="Cumulative Update for Microsoft server operating system version 21H2 for x64-based Systems" ;SSUSearchString="Servicing Stack Update for Microsoft server operating system version 21H2 for x64-based Systems" ; ID="Microsoft Server operating system-21H2"}
-$Products+=@{Product="Azure Stack HCI 20H2"                         ;SearchString="Cumulative Update for Azure Stack HCI, version 20H2"                                        ;SSUSearchString="Servicing Stack Update for Azure Stack HCI, version 20H2 for x64-based Systems"                  ; ID="Azure Stack HCI"}
-$Products+=@{Product="Windows Server 2019"                          ;SearchString="Cumulative Update for Windows Server 2019 for x64-based Systems"                            ;SSUSearchString="Servicing Stack Update for Windows Server 2019 for x64-based Systems"                            ; ID="Windows Server 2019"}
-$Products+=@{Product="Windows Server 2016"                          ;SearchString="Cumulative Update for Windows Server 2016 for x64-based Systems"                            ;SSUSearchString="Servicing Stack Update for Windows Server 2016 for x64-based Systems"                            ; ID="Windows Server 2016"}
-$Products+=@{Product="Windows 11 22H2"                              ;SearchString="Cumulative Update for Windows 11 Version 22H2 for x64-based Systems"                        ;SSUSearchString="Servicing Stack Update for Windows 11 Version 22H2 for x64-based Systems"                        ; ID="Windows 11"}
-$Products+=@{Product="Windows 10 21H2"                              ;SearchString="Cumulative Update for Windows 10 Version 21H2 for x64-based Systems"                        ;SSUSearchString="Servicing Stack Update for Windows 10 Version 21H2 for x64-based Systems"                        ; ID="Windows 10,  version 1903 and later, Windows 10 LTSB"}
-$Products+=@{Product="Windows 10 20H2"                              ;SearchString="Cumulative Update for Windows 10 Version 20H2 for x64-based Systems"                        ;SSUSearchString="Servicing Stack Update for Windows 10 Version 20H2 for x64-based Systems"                        ; ID="Windows 10,  version 1903 and later"}
-$Products+=@{Product="Windows 10 2004"                              ;SearchString="Cumulative Update for Windows 10 Version 2004 for x64-based Systems"                        ;SSUSearchString="Servicing Stack Update for Windows 10 Version 2004 for x64-based Systems"                        ; ID="Windows 10,  version 1903 and later"}
-$Products+=@{Product="Windows 10 1909"                              ;SearchString="Cumulative Update for Windows 10 Version 1909 for x64-based Systems"                        ;SSUSearchString="Servicing Stack Update for Windows 10 Version 1909 for x64-based Systems"                        ; ID="Windows 10,  version 1903 and later"}
+$Products+=@{Product="Azure Stack HCI 23H2"                         ;SearchString="Cumulative Update for Microsoft server operating system version 23H2 for x64-based Systems"  ;SSUSearchString=$null                                                                                             ; ID="Microsoft Server operating system-23H2"}                #MSFT really removed the ',' in CUs
+$Products+=@{Product="Azure Stack HCI 22H2"                         ;SearchString="Cumulative Update for Microsoft server operating system version 22H2 for x64-based Systems"  ;SSUSearchString=$null                                                                                             ; ID="Microsoft Server operating system-22H2"}               
+$Products+=@{Product="Azure Stack HCI 21H2 and Windows Server 2022" ;SearchString="Cumulative Update for Microsoft server operating system version 21H2 for x64-based Systems"  ;SSUSearchString="Servicing Stack Update for Microsoft server operating system version 21H2 for x64-based Systems" ; ID="Microsoft Server operating system-21H2"}
+$Products+=@{Product="Azure Stack HCI 20H2"                         ;SearchString="Cumulative Update for Azure Stack HCI, version 20H2"                                         ;SSUSearchString="Servicing Stack Update for Azure Stack HCI, version 20H2 for x64-based Systems"                  ; ID="Azure Stack HCI"}                                        #unsupported release SSU no longer required but remain for compat reasons
+$Products+=@{Product="Windows Server 2019"                          ;SearchString="Cumulative Update for Windows Server 2019 for x64-based Systems"                             ;SSUSearchString="Servicing Stack Update for Windows Server 2019 for x64-based Systems"                            ; ID="Windows Server 2019"}                                    #SSU no longer required but remain for compat reasons
+$Products+=@{Product="Windows Server 2016"                          ;SearchString="Cumulative Update for Windows Server 2016 for x64-based Systems"                             ;SSUSearchString="Servicing Stack Update for Windows Server 2016 for x64-based Systems"                            ; ID="Windows Server 2016"}                                    #SSU no longer required but remain for compat reasons
+$Products+=@{Product="Windows 11 23H2"                              ;SearchString="Cumulative Update for Windows 11 Version 23H2 for x64-based Systems"                         ;SSUSearchString=$null                                                                                             ; ID="Windows 11"}
+$Products+=@{Product="Windows 11 22H2"                              ;SearchString="Cumulative Update for Windows 11 Version 22H2 for x64-based Systems"                         ;SSUSearchString=$null                                                                                             ; ID="Windows 11"}
+$Products+=@{Product="Windows 10 21H2"                              ;SearchString="Cumulative Update for Windows 10 Version 21H2 for x64-based Systems"                         ;SSUSearchString="Servicing Stack Update for Windows 10 Version 21H2 for x64-based Systems"                        ; ID="Windows 10,  version 1903 and later, Windows 10 LTSB"}   #SSU no longer required but remain for compat reasons
+$Products+=@{Product="Windows 10 20H2"                              ;SearchString="Cumulative Update for Windows 10 Version 20H2 for x64-based Systems"                         ;SSUSearchString="Servicing Stack Update for Windows 10 Version 20H2 for x64-based Systems"                        ; ID="Windows 10,  version 1903 and later"}                    #SSU no longer required but remain for compat reasons
+$Products+=@{Product="Windows 10 2004"                              ;SearchString="Cumulative Update for Windows 10 Version 2004 for x64-based Systems"                         ;SSUSearchString="Servicing Stack Update for Windows 10 Version 2004 for x64-based Systems"                        ; ID="Windows 10,  version 1903 and later"}                    #SSU no longer required but remain for compat reasons
+$Products+=@{Product="Windows 10 1909"                              ;SearchString="Cumulative Update for Windows 10 Version 1909 for x64-based Systems"                         ;SSUSearchString="Servicing Stack Update for Windows 10 Version 1909 for x64-based Systems"                        ; ID="Windows 10,  version 1903 and later"}                    #SSU no longer required but remain for compat reasons
 
 #grab folder to download to
 $folder=Read-Host -Prompt "Please type path to download. For example `"c:\temp`" (if nothing specified, $PSScriptRoot is used)"
@@ -80,13 +82,18 @@ Foreach($SelectedProduct in $SelectedProducts){
     $update | Save-MSCatalogUpdate -Destination "$DestinationFolder" #-UseBits
 
     #Download SSU
-    $update=Get-MSCatalogUpdate -Search $item.SSUSearchString | Where-Object Products -eq $item.ID | Select-Object -First 1
-    if ($update){
-        Write-Output "Downloading $($update.title) to $destinationFolder"
-        $update | Save-MSCatalogUpdate -Destination $DestinationFolder #-UseBits
-    }
+    If (!($Null -eq $item.SSUSearchString)){
+        $update=Get-MSCatalogUpdate -Search $item.SSUSearchString | Where-Object Products -eq $item.ID | Select-Object -First 1
+        if ($update){
+            Write-Output "Downloading $($update.title) to $destinationFolder"
+            $update | Save-MSCatalogUpdate -Destination $DestinationFolder #-UseBits
+        }
+    }#end if check if SSUString is not $Null
+    else{
+        Write-Host "The selected release does not require seperate SSU." -ForegroundColor Green
+    }#end elseif check if SSUString is $Null
 }
 #endregion
 
 Write-Host "Job finished. Press enter to continue" -ForegroundColor Green
-Read-Host
+Read-Host