Merge branch 'main' into feature/diskConfigParameter

Author: audreyttt

.azure-pipelines/util/smoke-test-steps.yml

@@ -79,6 +79,18 @@ jobs:
        Write-Host "List artifacts..."
        Get-ChildItem "$(Pipeline.Workspace)\\LocalRepo\\"
 
+  - task: Bash@3
+    displayName: 'Ensure Mono installed (required for NuGet.exe on 1ES Ubuntu >= 24)'
+    condition: eq( variables['Agent.OS'], 'Linux' )
+    inputs:
+      targetType: inline
+      script: |
+        # Conditionally install Mono if missing from image
+        command -v mono >/dev/null || { 
+            echo "Mono not found, installing..."; 
+            sudo apt-get update -qq && sudo apt-get install -y mono-complete; 
+        }
+
   - task: NuGetCommand@2
     condition: and(succeeded(), eq(variables['GalleryName'], 'LocalRepo'))
     displayName: 'Download Previous Az .nupkg Files'

.github/CODEOWNERS

@@ -1,6 +1,6 @@
 # @wyunchi-ms @dolauli @isra-fel are from the Azure PowerShell team. Adding them ensures they can merge the PR for those modules.
 # To make sure Network PRs go to the right branch, e.g. network-april
-/src/Compute/    @EdwinBernal1 @grizzlytheodore @ntangy @sandido @wyunchi-ms @dolauli @isra-fel @VeryEarly @YanaXu @vidai-msft @NoriZC @notyashhh @Pan-Qi
+/src/Compute/    @ookoka @haagha @audreyttt @wyunchi-ms @dolauli @isra-fel @VeryEarly @YanaXu @vidai-msft @NoriZC @notyashhh @Pan-Qi
 /src/PolicyInsights/  @pilor @wyunchi-ms @dolauli @isra-fel @VeryEarly @YanaXu @vidai-msft @NoriZC @notyashhh @Pan-Qi 
 /src/Batch/ @wiboris @dpwatrous @wyunchi-ms @dolauli @isra-fel @VeryEarly @YanaXu @vidai-msft @NoriZC @notyashhh @Pan-Qi 
 

.github/policies/resourceManagement.yml

@@ -3887,6 +3887,7 @@ configuration:
         - mentionUsers:
             mentionees:
             - nazang
+            - mooshc
             replyTemplate: Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.
             assignMentionees: False
       - if:

NuGet.Config

@@ -36,6 +36,10 @@
 
 
 
+
+
+
+
 
 
 

docker/Dockerfile-alpine-3.20 renamed to docker/Dockerfile-alpine-3.21

@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/powershell:alpine-3.20
+FROM mcr.microsoft.com/dotnet/sdk:9.0-alpine3.21
 RUN apk update && apk upgrade --no-cache
 
 ARG REPOSITORY=PSGallery
@@ -11,9 +11,9 @@ ARG BUILD_DATE=
 ARG VERSION=
 ARG LATEST=
 ARG BLOB_URL=
-ARG IMAGE_NAME=mcr.microsoft.com/azure-powershell:${VERSION}-alpine-3.20
+ARG IMAGE_NAME=mcr.microsoft.com/azure-powershell:${VERSION}-alpine-3.21
 
-ENV AZUREPS_HOST_ENVIRONMENT="dockerImage/${VERSION}-alpine-3.20"
+ENV AZUREPS_HOST_ENVIRONMENT="dockerImage/${VERSION}-alpine-3.21"
 
 LABEL maintainer="Azure PowerShell Team <[email protected]>" \
     readme.md="http://aka.ms/azpsdockerreadme" \

docker/Dockerfile-ubi-8 renamed to docker/Dockerfile-alpine-3.22

@@ -1,5 +1,5 @@
-FROM mcr.microsoft.com/powershell:ubi-8
-RUN yum update -y && yum clean all
+FROM mcr.microsoft.com/dotnet/sdk:9.0-alpine3.22
+RUN apk update && apk upgrade --no-cache
 
 ARG REPOSITORY=PSGallery
 ARG MODULE=Az
@@ -11,26 +11,26 @@ ARG BUILD_DATE=
 ARG VERSION=
 ARG LATEST=
 ARG BLOB_URL=
-ARG IMAGE_NAME=mcr.microsoft.com/azure-powershell:${VERSION}-ubi-8
+ARG IMAGE_NAME=mcr.microsoft.com/azure-powershell:${VERSION}-alpine-3.22
 
-ENV AZUREPS_HOST_ENVIRONMENT="dockerImage/${VERSION}-ubi-8"
+ENV AZUREPS_HOST_ENVIRONMENT="dockerImage/${VERSION}-alpine-3.22"
 
 LABEL maintainer="Azure PowerShell Team <[email protected]>" \
-      readme.md="http://aka.ms/azpsdockerreadme" \
-      description="This Dockerfile will install the latest release of Azure PowerShell." \
-      org.label-schema.build-date=${BUILD_DATE} \
-      org.label-schema.usage="http://aka.ms/azpsdocker" \
-      org.label-schema.url="http://aka.ms/azpsdockerreadme" \
-      org.label-schema.vcs-url="https://github.com/Azure/azure-powershell" \
-      org.label-schema.name="azure powershell" \
-      org.label-schema.vendor="Azure PowerShell" \
-      org.label-schema.version=${VERSION} \
-      org.label-schema.schema-version="1.0" \
-      org.label-schema.vcs-ref=${VCS_REF} \
-      org.label-schema.docker.cmd="docker run --rm ${IMAGE_NAME} pwsh -c '\$PSVERSIONTABLE'" \
-      org.label-schema.docker.cmd.devel="docker run -it --rm -e 'DebugPreference=Continue' ${IMAGE_NAME} pwsh" \
-      org.label-schema.docker.cmd.test="currently not available" \
-      org.label-schema.docker.cmd.help="docker run --rm ${IMAGE_NAME} pwsh -c Get-Help"
+    readme.md="http://aka.ms/azpsdockerreadme" \
+    description="This Dockerfile will install the latest release of Azure PowerShell." \
+    org.label-schema.build-date=${BUILD_DATE} \
+    org.label-schema.usage="http://aka.ms/azpsdocker" \
+    org.label-schema.url="http://aka.ms/azpsdockerreadme" \
+    org.label-schema.vcs-url="https://github.com/Azure/azure-powershell" \
+    org.label-schema.name="azure powershell" \
+    org.label-schema.vendor="Azure PowerShell" \
+    org.label-schema.version=${VERSION} \
+    org.label-schema.schema-version="1.0" \
+    org.label-schema.vcs-ref=${VCS_REF} \
+    org.label-schema.docker.cmd="docker run --rm ${IMAGE_NAME} pwsh -c '\$PSVERSIONTABLE'" \
+    org.label-schema.docker.cmd.devel="docker run -it --rm -e 'DebugPreference=Continue' ${IMAGE_NAME} pwsh" \
+    org.label-schema.docker.cmd.test="currently not available" \
+    org.label-schema.docker.cmd.help="docker run --rm ${IMAGE_NAME} pwsh -c Get-Help"
 
 RUN if [ "${LATEST}" = True ] ; then \
         # install latest azure-powershell from BLOB

docker/Dockerfile-azurelinux-3.0

@@ -1,5 +1,5 @@
-FROM mcr.microsoft.com/powershell:azurelinux-3.0
-RUN tdnf update -y && tdnf upgrade -y && tdnf clean all
+FROM mcr.microsoft.com/dotnet/sdk:9.0-azurelinux3.0
+RUN tdnf update -y && tdnf upgrade -y && tdnf install -y tar gzip && tdnf clean all
 
 ARG REPOSITORY=PSGallery
 ARG MODULE=Az

docker/Dockerfile-azurelinux-3.0-arm64

@@ -1,5 +1,5 @@
-FROM mcr.microsoft.com/powershell:azurelinux-3.0-arm64
-RUN tdnf update -y && tdnf upgrade -y && tdnf clean all
+FROM mcr.microsoft.com/dotnet/sdk:9.0-azurelinux3.0-arm64v8
+RUN tdnf update -y && tdnf upgrade -y && tdnf install -y tar gzip && tdnf clean all
 
 ARG REPOSITORY=PSGallery
 ARG MODULE=Az
@@ -13,7 +13,7 @@ ARG LATEST=
 ARG BLOB_URL=
 ARG IMAGE_NAME=mcr.microsoft.com/azure-powershell:${VERSION}-azurelinux-3.0-arm64
 
-ENV AZUREPS_HOST_ENVIRONMENT="dockerImage/${VERSION}-azurelinux-3.0"
+ENV AZUREPS_HOST_ENVIRONMENT="dockerImage/${VERSION}-azurelinux-3.0-arm64"
 
 LABEL maintainer="Azure PowerShell Team <[email protected]>" \
       readme.md="http://aka.ms/azpsdockerreadme" \

docker/Dockerfile-debian-12

@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/powershell:debian-12
+FROM mcr.microsoft.com/dotnet/sdk:9.0-bookworm-slim
 RUN apt-get update && apt-get upgrade -y && apt-get clean && rm -rf /var/lib/apt/lists/*
 
 ARG REPOSITORY=PSGallery