@@ -19,7 +19,6 @@ parameters:
1919 displayName : ' '
2020 runtimeVariant : ' '
2121 pool : ' '
22- pgoType : ' '
2322 runOnlyIfDependenciesSucceeded : false
2423
2524 # The target names here should match container names in the resources section in our pipelines, like runtime.yml
@@ -59,11 +58,10 @@ jobs:
5958
6059 dependOnEvaluatePaths : ${{ parameters.dependOnEvaluatePaths }}
6160 disableClrTest : ${{ parameters.disableClrTest }}
62- pgoType : ${{ parameters.pgoType }}
6361
6462 # Compute job name from template parameters
65- name : ${{ format('installer_{0}_{1}_{2}_{3}_{4}_', parameters.pgoType , parameters.runtimeFlavor, parameters.runtimeVariant, coalesce(parameters.name, parameters.platform), parameters.buildConfig) }}
66- displayName : ${{ format('{0} Installer Build and Test {1} {2} {3} {4}', parameters.pgoType , parameters.runtimeFlavor, parameters.runtimeVariant, coalesce(parameters.name, parameters.platform), parameters.buildConfig) }}
63+ name : ${{ format('installer_{0}_{1}_{2}_{3}_' , parameters.runtimeFlavor, parameters.runtimeVariant, coalesce(parameters.name, parameters.platform), parameters.buildConfig) }}
64+ displayName : ${{ format('Installer Build and Test {0} { 1} {2} {3}' , parameters.runtimeFlavor, parameters.runtimeVariant, coalesce(parameters.name, parameters.platform), parameters.buildConfig) }}
6765
6866 # Run all steps in the container.
6967 # Note that the containers are defined in platform-matrix.yml
@@ -99,25 +97,18 @@ jobs:
9997 not(and(
10098 eq(parameters.osGroup, 'linux'),
10199 eq(parameters.osSubgroup, ''))
102- )),
103- eq(parameters.pgoType, 'PGO')) }}
100+ ))) }}
104101
105102 - name : BuildAction
106103 value : -test
107104
108- - ${{ if eq(or(not(in(parameters.archType, 'x64', 'x86')), eq(parameters.runtimeFlavor, 'mono'), eq(parameters.isOfficialBuild, true), and(eq(parameters.crossBuild, true), not(and(eq(parameters.osGroup, 'linux'), eq(parameters.osSubgroup, '')))), eq(parameters.pgoType, 'PGO') ), true) }} :
105+ - ${{ if eq(or(not(in(parameters.archType, 'x64', 'x86')), eq(parameters.runtimeFlavor, 'mono'), eq(parameters.isOfficialBuild, true), and(eq(parameters.crossBuild, true), not(and(eq(parameters.osGroup, 'linux'), eq(parameters.osSubgroup, ''))))), true) }} :
109106 - name : BuildAction
110107 value : ' '
111108
112109 - name : SignType
113110 value : test
114111
115- - name : pgoInstrumentArg
116- value : ' '
117- - ${{ if eq(parameters.pgoType, 'PGO' )}} :
118- - name : pgoInstrumentArg
119- value : ' -pgoinstrument '
120-
121112 # Set up non-PR build from internal project
122113 - ${{ if eq(parameters.isOfficialBuild, true) }} :
123114 - name : SignType
@@ -153,7 +144,6 @@ jobs:
153144 build.cmd -subset host+packs -ci
154145 $(BuildAction)
155146 -configuration $(_BuildConfig)
156- $(pgoInstrumentArg)
157147 $(LiveOverridePathArgs)
158148 $(CommonMSBuildArgs)
159149 $(MsbuildSigningArguments)
@@ -225,7 +215,6 @@ jobs:
225215 /p:CrossBuild=${{ parameters.crossBuild }}
226216 /p:PortableBuild=$(_PortableBuild)
227217 /p:SkipTests=$(SkipTests)
228- $(pgoInstrumentArg)
229218 $(LiveOverridePathArgs)
230219 $(CommonMSBuildArgs)
231220
@@ -265,7 +254,7 @@ jobs:
265254 /p:RuntimeArtifactsPath=$(buildCommandSourcesDirectory)$(RuntimeDownloadPath)
266255 /p:RuntimeConfiguration=${{ parameters.liveRuntimeBuildConfig }}
267256 - name : RuntimeArtifactName
268- value : $(runtimeFlavorName)Product_${{ parameters.pgoType }}_${{ parameters. runtimeVariant }}_$(liveRuntimeLegName)
257+ value : $(runtimeFlavorName)Product_${{ parameters.runtimeVariant }}_$(liveRuntimeLegName)
269258
270259 - ${{ if ne(parameters.liveLibrariesBuildConfig, '') }} :
271260 - name : liveLibrariesLegName
@@ -286,14 +275,13 @@ jobs:
286275 - evaluate_paths
287276 - ${{ parameters.dependsOn }}
288277 - ${{ if ne(parameters.liveRuntimeBuildConfig, '') }} :
289- - ${{ format('{0}_{1}_product_build_{2}{3}_{4}_{5}{6} ',
278+ - ${{ format('{0}_{1}_product_build_{2}{3}_{4}_{5}',
290279 parameters.runtimeFlavor,
291280 parameters.runtimeVariant,
292281 parameters.osGroup,
293282 parameters.osSubgroup,
294283 parameters.archType,
295- parameters.liveRuntimeBuildConfig,
296- parameters.pgoType) }}
284+ parameters.liveRuntimeBuildConfig) }}
297285 - ${{ if ne(parameters.liveLibrariesBuildConfig, '') }} :
298286 - libraries_build_${{ format('{0}{1}_{2}_{3}',
299287 parameters.osGroup,
@@ -416,7 +404,7 @@ jobs:
416404 displayName: Disk Usage after Build
417405
418406 # Only in glibc leg, we produce RPMs and Debs
419- - ${{ if and(eq(parameters.runtimeFlavor, 'coreclr'), or(eq(parameters.platform, 'linux_x64'), eq(parameters.platform, 'linux_arm64')), eq(parameters.osSubgroup, ''), eq(parameters.pgoType, '') )}} :
407+ - ${{ if and(eq(parameters.runtimeFlavor, 'coreclr'), or(eq(parameters.platform, 'linux_x64'), eq(parameters.platform, 'linux_arm64')), eq(parameters.osSubgroup, ''))}} :
420408 - ${{ each packageBuild in parameters.packageDistroList }} :
421409 # This leg's RID matches the build image. Build its distro-dependent packages, as well as
422410 # the distro-independent installers. (There's no particular reason to build the distro-
@@ -437,7 +425,6 @@ jobs:
437425 runtimeFlavor : ${{ parameters.runtimeFlavor }}
438426 runtimeVariant : ${{ parameters.runtimeVariant }}
439427 isOfficialBuild : ${{ eq(parameters.isOfficialBuild, true) }}
440- pgoType : ${{ parameters.pgoType }}
441428 skipTests : ${{ eq(variables.SkipTests, true) }}
442429
443430 - ${{ if ne(parameters.osGroup, 'windows') }} :
0 commit comments