Merge pull request #668 from MiYanni/UpdateImageAndRunNameInternal

Author: MiYanni

eng/pipelines/official.yml

@@ -125,6 +125,8 @@ parameters:
 variables:
 # Variables used: DncEngInternalBuildPool
 - template: /eng/common/templates-official/variables/pool-providers.yml@source
+- name: AgentImageInternal
+  value: windows.vs2026preview.scout.amd64
 ############### ARCADE ###############
 # Both this (used in Arcade for the MicroBuildSigningPlugin) and DotNetSignType (used in Arcade in Sign.proj) are necessary to set the sign type.
 # https://github.com/dotnet/arcade/blob/ccae251ef033746eb0213329953f5e3c1687693b/Documentation/ArcadeSdk.md#common-steps-in-azure-devops-pipeline
@@ -171,7 +173,7 @@ extends:
         - repository: source
       sourceAnalysisPool:
         name: $(DncEngInternalBuildPool)
-        image: 1es-windows-2022
+        image: $(AgentImageInternal)
         os: windows
       policheck:
         enabled: true
@@ -224,7 +226,7 @@ extends:
           environment: DotNet-SDK-Workloads
           pool:
             name: $(DncEngInternalBuildPool)
-            image: 1es-windows-2022
+            image: $(AgentImageInternal)
             os: windows
           templateContext:
             # Docs: https://eng.ms/docs/cloud-ai-platform/devdiv/one-engineering-system-1es/1es-docs/1es-pipeline-templates/features/releasepipelines/overview

eng/pipelines/templates/jobs/workload-build.yml

@@ -25,7 +25,7 @@ jobs:
       timeoutInMinutes: 120
       pool:
         name: $(DncEngInternalBuildPool)
-        image: 1es-windows-2022
+        image: $(AgentImageInternal)
         os: windows
       steps:
       - template: /eng/pipelines/templates/steps/workload-checkout.yml@self

eng/pipelines/templates/jobs/workload-insertion-job.yml

@@ -14,7 +14,7 @@ jobs:
   timeoutInMinutes: 120
   pool:
     name: $(DncEngInternalBuildPool)
-    image: 1es-windows-2022
+    image: $(AgentImageInternal)
     os: windows
   templateContext:
     type: buildJob

eng/pipelines/templates/stages/workload-public-build.yml

@@ -13,7 +13,7 @@ stages:
       displayName: Build Repo
       pool:
         name: $(DncEngPublicBuildPool)
-        demands: ImageOverride -equals windows.vs2022.amd64.open
+        demands: ImageOverride -equals $(AgentImagePublic)
       artifacts:
         publish:
           logs:

eng/pipelines/templates/variables/workload-public.yml

@@ -1,4 +1,6 @@
 variables:
+- name: AgentImagePublic
+  value: windows.vs2026preview.scout.amd64.open
 - name: _SignType
   value: test
 - name: _TeamName

src/Microsoft.NET.Workloads/Microsoft.NET.Workloads.csproj

@@ -159,7 +159,7 @@
     </CreateLightCommandPackageDrop>
   </Target>
 
-  <Target Name="UpdateRunNameWithWorkloadsVersion" AfterTargets="Build" Condition="'$(TF_BUILD)' != ''">
+  <Target Name="UpdateRunNameWithWorkloadsVersion" AfterTargets="Build" Condition="'$(TF_BUILD)' != '' and '$(SYSTEM_TEAMPROJECT)' == 'internal'">
     <!-- SOURCEBRANCHCOMMITMESSAGE is set to the Azure Pipelines environment within the SetRunName step. -->
     <!-- We simply pull it out of the environment variables because trying to set it to an MSBuild property can cause issues in the YAML if the message contains special characters. -->
     <Message Text="##vso[build.updatebuildnumber]$(OfficialBuildId) • $(WorkloadsVersion) • $(SOURCEBRANCHCOMMITMESSAGE)" Importance="high" />