From ad0d270d85462fef3a2e7ea64d694edf7f750a2c Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Thu, 2 Apr 2026 09:50:13 +0000
Subject: [PATCH 1/5] Initial plan


From 8e2bb409e4b99542ed0d82835f1b5bf2f8bda469 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Thu, 2 Apr 2026 09:56:53 +0000
Subject: [PATCH 2/5] Replace deprecated
 enablePublishBuildArtifacts/enablePublishBuildAssets with artifacts parameter

Agent-Logs-Url: https://github.com/microsoft/testfx/sessions/a489a43e-fafb-4532-bbcb-4c32e0a27ff9

Co-authored-by: Youssef1313 <31348972+Youssef1313@users.noreply.github.com>
---
 azure-pipelines-official.yml | 6 ++++--
 azure-pipelines.yml          | 6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/azure-pipelines-official.yml b/azure-pipelines-official.yml
index 597b2741e6..2da2d698b9 100644
--- a/azure-pipelines-official.yml
+++ b/azure-pipelines-official.yml
@@ -103,11 +103,13 @@ extends:
       - template: /eng/common/templates-official/jobs/jobs.yml@self
         parameters:
           enableMicrobuild: true
-          enablePublishBuildArtifacts: true
           enablePublishTestResults: true
           testResultsFormat: 'vstest'
-          enablePublishBuildAssets: true
           enablePublishUsingPipelines: true
+          artifacts:
+            publish:
+              logs: true
+              manifests: true
           enableTelemetry: true
           jobs:
           - job: Windows
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index c0d6ba49aa..7f2fefd874 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -53,11 +53,13 @@ stages:
   - template: /eng/common/templates/jobs/jobs.yml
     parameters:
       enableMicrobuild: true
-      enablePublishBuildArtifacts: true
       enablePublishTestResults: true
       testResultsFormat: 'vstest'
-      enablePublishBuildAssets: true
       enablePublishUsingPipelines: true
+      artifacts:
+        publish:
+          logs: true
+          manifests: true
       enableTelemetry: true
       jobs:
       - job: Windows

From 607e9d5dfcc5b3ff883e0a4d2e425624268571f4 Mon Sep 17 00:00:00 2001
From: Youssef Victor <youssefvictor00@gmail.com>
Date: Thu, 2 Apr 2026 12:10:30 +0200
Subject: [PATCH 3/5] Update azure-pipelines.yml

---
 azure-pipelines.yml | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 7f2fefd874..a526f42495 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -58,6 +58,7 @@ stages:
       enablePublishUsingPipelines: true
       artifacts:
         publish:
+          artifacts: true
           logs: true
           manifests: true
       enableTelemetry: true
@@ -115,13 +116,6 @@ stages:
           name: Build
           displayName: Build
 
-        - task: PublishBuildArtifacts@1
-          displayName: 'Publish NuGet packages'
-          inputs:
-            PathtoPublish: '$(Build.SourcesDirectory)/artifacts/packages/$(_BuildConfig)/Shipping'
-            ArtifactName: '$(Agent.Os)_$(Agent.JobName)_Attempt$(System.JobAttempt)'
-          condition: always()
-
         - ${{ if eq(parameters.SkipTests, False) }}:
 
           # Because the build step is using -ci flag, restore is done in a local .packages directory.

From fcc1bc7445bd130c68a5b9a7896565b9c3a7efd3 Mon Sep 17 00:00:00 2001
From: Youssef Victor <youssefvictor00@gmail.com>
Date: Thu, 2 Apr 2026 12:29:24 +0200
Subject: [PATCH 4/5] Fix for samples build

---
 azure-pipelines.yml | 66 ++++++++++++++++++++++++++-------------------
 1 file changed, 38 insertions(+), 28 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index a526f42495..85cc81a0b0 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -167,34 +167,6 @@ stages:
               ArtifactName: TestResults_Windows_$(_BuildConfig)
             condition: failed()
 
-      - job: WindowsSamples
-        timeoutInMinutes: 30
-        pool:
-          name: NetCore-Public
-          demands: ImageOverride -equals windows.vs2026preview.scout.amd64.open
-        strategy:
-          matrix:
-            Release:
-              _BuildConfig: Release
-            Debug:
-              _BuildConfig: Debug
-        steps:
-        - task: PowerShell@2
-          displayName: 'Install Windows SDK'
-          inputs:
-            targetType: filePath
-            filePath: './eng/install-windows-sdk.ps1'
-            failOnStderr: true
-            showWarnings: true
-
-        - task: PowerShell@2
-          displayName: 'Build Samples'
-          inputs:
-            targetType: filePath
-            filePath: './eng/build-samples.ps1'
-            arguments: '-Configuration $(_BuildConfig) -TreatWarningsAsErrors -BinaryLogDirectory "$(Build.SourcesDirectory)\artifacts\log\$(_BuildConfig)"'
-            failOnStderr: false
-
       - job: Linux
         timeoutInMinutes: 90
         pool:
@@ -321,3 +293,41 @@ stages:
               PathtoPublish: '$(Build.ArtifactStagingDirectory)/binlogs'
               ArtifactName: Integration_Tests_MacOS_Binlogs_$(_BuildConfig)
             condition: always()
+
+  - template: /eng/common/templates/jobs/jobs.yml
+    parameters:
+      enableMicrobuild: true
+      enablePublishUsingPipelines: true
+      artifacts:
+        publish:
+          logs: true
+          manifests: true
+      enableTelemetry: true
+      jobs:
+      - job: WindowsSamples
+        timeoutInMinutes: 30
+        pool:
+          name: NetCore-Public
+          demands: ImageOverride -equals windows.vs2026preview.scout.amd64.open
+        strategy:
+          matrix:
+            Release:
+              _BuildConfig: Release
+            Debug:
+              _BuildConfig: Debug
+        steps:
+        - task: PowerShell@2
+          displayName: 'Install Windows SDK'
+          inputs:
+            targetType: filePath
+            filePath: './eng/install-windows-sdk.ps1'
+            failOnStderr: true
+            showWarnings: true
+
+        - task: PowerShell@2
+          displayName: 'Build Samples'
+          inputs:
+            targetType: filePath
+            filePath: './eng/build-samples.ps1'
+            arguments: '-Configuration $(_BuildConfig) -TreatWarningsAsErrors -BinaryLogDirectory "$(Build.SourcesDirectory)\artifacts\log\$(_BuildConfig)"'
+            failOnStderr: false

From 0b775ca8b051fc265e38f2bd76f3cfafed50dfe4 Mon Sep 17 00:00:00 2001
From: Youssef Victor <youssefvictor00@gmail.com>
Date: Thu, 2 Apr 2026 12:31:17 +0200
Subject: [PATCH 5/5] Update azure-pipelines.yml

---
 azure-pipelines.yml | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 85cc81a0b0..0f2fe9f91a 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -188,13 +188,6 @@ stages:
             /p:FastAcceptanceTest=true
           displayName: Build
 
-        - task: PublishBuildArtifacts@1
-          displayName: 'Publish NuGet packages'
-          inputs:
-            PathtoPublish: '$(Build.SourcesDirectory)/artifacts/packages/$(_BuildConfig)/Shipping'
-            ArtifactName: '$(Agent.Os)_$(Agent.JobName)_Attempt$(System.JobAttempt)'
-          condition: always()
-
         - ${{ if eq(parameters.SkipTests, False) }}:
           # Because the build step is using -ci flag, restore is done in a local .packages directory.
           # We need to pass NUGET_PACKAGES so that when dotnet test is doing evaluation phase on the projects, it can resolve .props/.targets from packages and import them.
@@ -252,13 +245,6 @@ stages:
             /p:FastAcceptanceTest=true
           displayName: Build
 
-        - task: PublishBuildArtifacts@1
-          displayName: 'Publish NuGet packages'
-          inputs:
-            PathtoPublish: '$(Build.SourcesDirectory)/artifacts/packages/$(_BuildConfig)/Shipping'
-            ArtifactName: '$(Agent.Os)_$(Agent.JobName)_Attempt$(System.JobAttempt)'
-          condition: always()
-
         - ${{ if eq(parameters.SkipTests, False) }}:
           # Because the build step is using -ci flag, restore is done in a local .packages directory.
           # We need to pass NUGET_PACKAGES so that when dotnet test is doing evaluation phase on the projects, it can resolve .props/.targets from packages and import them.