Skip to content

Commit b52c779

Browse files
safernsafern
authored
Disable force_install warning produced by CMake for libraries native build. (dotnet#32853)
* Use VS2019 Preview for libraries official build This lets us enable warn as error in libraries build because this pools contain a newer CMake. * Revert changes in runtime-official.yml * Remove usages of useVsPreviewPool in runtime.yml * Revert useVsPreviewPool usages in xplat-setup.yml * Revert useVsPreviewPool changes in perf.yml * Disable force_install warning in libraries build. * Enable warnaserror in global live build. * Remove empty line in perf.yml
1 parent bf1d573 commit b52c779

5 files changed

Lines changed: 8 additions & 66 deletions

File tree

‎eng/pipelines/common/global-build-job.yml‎

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,7 @@ jobs:
2222
workspace:
2323
clean: all
2424

25-
variables:
26-
- ${{ each variable in parameters.variables }}:
27-
- ${{insert}}: ${{ variable }}
28-
- name: noWarnAsErrorArg
29-
value: ''
30-
- ${{ if eq(parameters.osGroup, 'Windows_NT') }}:
31-
- name: noWarnAsErrorArg
32-
value: -warnAsError:0
25+
variables: ${{ parameters.variables }}
3326

3427
steps:
3528
- ${{ if eq(parameters.osGroup, 'OSX') }}:
@@ -45,7 +38,7 @@ jobs:
4538
- template: /eng/pipelines/common/clone-checkout-bundle-step.yml
4639

4740
# Build
48-
- script: $(Build.SourcesDirectory)$(dir)build$(scriptExt) -ci -arch ${{ parameters.archType }} $(noWarnAsErrorArg) ${{ parameters.buildArgs }}
41+
- script: $(Build.SourcesDirectory)$(dir)build$(scriptExt) -ci -arch ${{ parameters.archType }} ${{ parameters.buildArgs }}
4942
displayName: Build product
5043

5144
- task: PublishBuildArtifacts@1

‎eng/pipelines/common/xplat-setup.yml‎

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -89,23 +89,13 @@ jobs:
8989

9090
# Official Build Windows Pool
9191
${{ if and(eq(parameters.osGroup, 'Windows_NT'), ne(variables['System.TeamProject'], 'public')) }}:
92-
${{ if eq(parameters.jobParameters.useVsPreviewPool, true) }}:
93-
name: NetCoreInternal-Pool
94-
queue: BuildPool.Windows.10.Amd64.VS2019.Pre
95-
96-
${{ if ne(parameters.jobParameters.useVsPreviewPool, true) }}:
97-
name: NetCoreInternal-Pool
98-
queue: BuildPool.Windows.10.Amd64.VS2019
92+
name: NetCoreInternal-Pool
93+
queue: BuildPool.Windows.10.Amd64.VS2019
9994

10095
# Public Windows Build Pool
10196
${{ if and(eq(parameters.osGroup, 'Windows_NT'), eq(variables['System.TeamProject'], 'public')) }}:
102-
${{ if eq(parameters.jobParameters.useVsPreviewPool, true) }}:
103-
name: NetCorePublic-Pool
104-
queue: BuildPool.Windows.10.Amd64.VS2019.Pre.Open
105-
106-
${{ if ne(parameters.jobParameters.useVsPreviewPool, true) }}:
107-
name: NetCorePublic-Pool
108-
queue: BuildPool.Windows.10.Amd64.VS2019.Open
97+
name: NetCorePublic-Pool
98+
queue: BuildPool.Windows.10.Amd64.VS2019.Open
10999

110100

111101
${{ if eq(parameters.helixQueuesTemplate, '') }}:

‎eng/pipelines/coreclr/perf.yml‎

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -52,28 +52,14 @@ jobs:
5252

5353
- template: /eng/pipelines/common/platform-matrix.yml
5454
parameters:
55-
jobTemplate: /eng/pipelines/coreclr/templates/build-job.yml
55+
jobTemplate: /eng/pipelines/common/build-coreclr-and-libraries-job.yml
5656
buildConfig: release
5757
platforms:
5858
- Linux_x64
5959
- Windows_NT_x64
6060
- Windows_NT_x86
6161
jobParameters:
6262
testGroup: perf
63-
useVsPreviewPool: false
64-
65-
- template: /eng/pipelines/common/platform-matrix.yml
66-
parameters:
67-
jobTemplate: /eng/pipelines/libraries/build-job.yml
68-
buildConfig: Release
69-
platforms:
70-
- Linux_x64
71-
- Windows_NT_x64
72-
- Windows_NT_x86
73-
jobParameters:
74-
useVsPreviewPool: true
75-
liveRuntimeBuildConfig: release
76-
7763

7864
- template: /eng/pipelines/common/platform-matrix.yml
7965
parameters:

‎eng/pipelines/runtime.yml‎

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,6 @@ jobs:
137137
- Windows_NT_arm64
138138
jobParameters:
139139
testGroup: innerloop
140-
useVsPreviewPool: false
141140
condition: >-
142141
or(
143142
eq(dependencies.checkout.outputs['SetPathVars_coreclr.containsChange'], true),
@@ -155,7 +154,6 @@ jobs:
155154
- OSX_x64
156155
jobParameters:
157156
testGroup: innerloop
158-
useVsPreviewPool: false
159157
condition: >-
160158
or(
161159
eq(dependencies.checkout.outputs['SetPathVars_coreclr.containsChange'], true),
@@ -182,7 +180,6 @@ jobs:
182180
- Windows_NT_arm
183181
- Windows_NT_arm64
184182
jobParameters:
185-
useVsPreviewPool: false
186183
testGroup: innerloop
187184

188185
#
@@ -196,7 +193,6 @@ jobs:
196193
- Linux_x64
197194
- Windows_NT_x64
198195
jobParameters:
199-
useVsPreviewPool: false
200196
condition: >-
201197
or(
202198
eq(dependencies.checkout.outputs['SetPathVars_coreclr.containsChange'], true),
@@ -223,7 +219,6 @@ jobs:
223219
# - Windows_NT_arm
224220
# - Windows_NT_arm64
225221
jobParameters:
226-
useVsPreviewPool: false
227222
condition: >-
228223
or(
229224
eq(dependencies.checkout.outputs['SetPathVars_libraries.containsChange'], true),
@@ -251,7 +246,6 @@ jobs:
251246
# - Windows_NT_arm
252247
# - Windows_NT_arm64
253248
jobParameters:
254-
useVsPreviewPool: false
255249
condition: >-
256250
or(
257251
eq(dependencies.checkout.outputs['SetPathVars_libraries.containsChange'], true),
@@ -280,7 +274,6 @@ jobs:
280274
# - Windows_NT_arm64
281275
jobParameters:
282276
llvm: true
283-
useVsPreviewPool: false
284277
condition: >-
285278
or(
286279
eq(dependencies.checkout.outputs['SetPathVars_libraries.containsChange'], true),
@@ -308,7 +301,6 @@ jobs:
308301
# - Windows_NT_arm
309302
# - Windows_NT_arm64
310303
jobParameters:
311-
useVsPreviewPool: false
312304
llvm: true
313305
condition: >-
314306
or(
@@ -334,7 +326,6 @@ jobs:
334326
- Windows_NT_x86
335327
jobParameters:
336328
liveRuntimeBuildConfig: release
337-
useVsPreviewPool: true
338329

339330
- template: /eng/pipelines/common/platform-matrix.yml
340331
parameters:
@@ -348,7 +339,6 @@ jobs:
348339
- Windows_NT_x64
349340
jobParameters:
350341
liveRuntimeBuildConfig: release
351-
useVsPreviewPool: true
352342
#
353343
# Libraries Build that only run when libraries is changed
354344
#
@@ -362,7 +352,6 @@ jobs:
362352
- Windows_NT_x86
363353
jobParameters:
364354
liveRuntimeBuildConfig: release
365-
useVsPreviewPool: true
366355
condition: >-
367356
or(
368357
eq(dependencies.checkout.outputs['SetPathVars_libraries.containsChange'], true),
@@ -378,7 +367,6 @@ jobs:
378367
- Windows_NT_x64
379368
helixQueuesTemplate: /eng/pipelines/libraries/helix-queues-setup.yml
380369
jobParameters:
381-
useVsPreviewPool: true
382370
isFullMatrix: ${{ variables.isFullMatrix }}
383371
framework: net472
384372
runTests: true
@@ -396,7 +384,6 @@ jobs:
396384
- Windows_NT_x64
397385
helixQueuesTemplate: /eng/pipelines/libraries/helix-queues-setup.yml
398386
jobParameters:
399-
useVsPreviewPool: true
400387
isFullMatrix: ${{ variables.isFullMatrix }}
401388
framework: allConfigurations
402389
runTests: true
@@ -421,7 +408,6 @@ jobs:
421408
- Windows_NT_arm
422409
- Windows_NT_arm64
423410
jobParameters:
424-
useVsPreviewPool: false
425411
liveRuntimeBuildConfig: release
426412
liveLibrariesBuildConfig: Release
427413

@@ -435,7 +421,6 @@ jobs:
435421
- Linux_musl_x64
436422
- Windows_NT_x64
437423
jobParameters:
438-
useVsPreviewPool: false
439424
liveRuntimeBuildConfig: release
440425
liveLibrariesBuildConfig: ${{ variables.debugOnPrReleaseOnRolling }}
441426

@@ -452,7 +437,6 @@ jobs:
452437
- Linux_x64
453438
- Windows_NT_x64
454439
jobParameters:
455-
useVsPreviewPool: false
456440
isOfficialBuild: false
457441
liveRuntimeBuildConfig: release
458442
testScope: innerloop
@@ -476,7 +460,6 @@ jobs:
476460
helixQueueGroup: pr
477461
helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml
478462
jobParameters:
479-
useVsPreviewPool: false
480463
liveLibrariesBuildConfig: Release
481464
condition: >-
482465
or(
@@ -497,7 +480,6 @@ jobs:
497480
- Windows_NT_arm
498481
- Windows_NT_arm64
499482
jobParameters:
500-
useVsPreviewPool: false
501483
testGroup: innerloop
502484
liveLibrariesBuildConfig: Release
503485
condition: >-
@@ -519,7 +501,6 @@ jobs:
519501
- Linux_arm64
520502
- Windows_NT_x64
521503
jobParameters:
522-
useVsPreviewPool: false
523504
testGroup: innerloop
524505
liveLibrariesBuildConfig: ${{ variables.debugOnPrReleaseOnRolling }}
525506
condition: >-
@@ -543,7 +524,6 @@ jobs:
543524
helixQueueGroup: pr
544525
helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml
545526
jobParameters:
546-
useVsPreviewPool: false
547527
testGroup: innerloop
548528
liveLibrariesBuildConfig: Release
549529
condition: >-
@@ -563,7 +543,6 @@ jobs:
563543
helixQueueGroup: pr
564544
helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml
565545
jobParameters:
566-
useVsPreviewPool: false
567546
testGroup: innerloop
568547
liveLibrariesBuildConfig: ${{ variables.debugOnPrReleaseOnRolling }}
569548
condition: >-
@@ -587,7 +566,6 @@ jobs:
587566
- Linux_x64
588567
helixQueuesTemplate: /eng/pipelines/libraries/helix-queues-setup.yml
589568
jobParameters:
590-
useVsPreviewPool: false
591569
isOfficialBuild: false
592570
isFullMatrix: ${{ variables.isFullMatrix }}
593571
testScope: innerloop
@@ -612,7 +590,6 @@ jobs:
612590
- Windows_NT_x86
613591
helixQueuesTemplate: /eng/pipelines/libraries/helix-queues-setup.yml
614592
jobParameters:
615-
useVsPreviewPool: false
616593
isOfficialBuild: false
617594
isFullMatrix: ${{ variables.isFullMatrix }}
618595
testScope: innerloop
@@ -645,7 +622,6 @@ jobs:
645622
- Windows_NT_x86
646623
helixQueuesTemplate: /eng/pipelines/libraries/helix-queues-setup.yml
647624
jobParameters:
648-
useVsPreviewPool: false
649625
isOfficialBuild: false
650626
isFullMatrix: ${{ variables.isFullMatrix }}
651627
testScope: innerloop
@@ -671,7 +647,6 @@ jobs:
671647
helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml
672648
helixQueueGroup: libraries
673649
jobParameters:
674-
useVsPreviewPool: false
675650
testScope: innerloop
676651
liveRuntimeBuildConfig: checked
677652
dependsOnTestBuildConfiguration: ${{ variables.debugOnPrReleaseOnRolling }}
@@ -692,7 +667,6 @@ jobs:
692667
helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml
693668
helixQueueGroup: libraries
694669
jobParameters:
695-
useVsPreviewPool: false
696670
testScope: innerloop
697671
liveRuntimeBuildConfig: checked
698672
dependsOnTestBuildConfiguration: ${{ variables.debugOnPrReleaseOnRolling }}
@@ -715,7 +689,6 @@ jobs:
715689
helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml
716690
helixQueueGroup: libraries
717691
jobParameters:
718-
useVsPreviewPool: false
719692
testScope: innerloop
720693
liveRuntimeBuildConfig: checked
721694
dependsOnTestBuildConfiguration: ${{ variables.debugOnPrReleaseOnRolling }}

‎src/libraries/Native/build-native.cmd‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ goto :Failure
145145

146146
:BuildNativeProj
147147
:: Build the project created by Cmake
148-
set __msbuildArgs=/p:Platform=%__BuildArch% /p:PlatformToolset="%__PlatformToolset%"
148+
set __msbuildArgs=/p:Platform=%__BuildArch% /p:PlatformToolset="%__PlatformToolset%" -noWarn:MSB8065
149149

150150
call msbuild "%__IntermediatesDir%\install.vcxproj" /t:%__BuildTarget% /p:Configuration=%CMAKE_BUILD_TYPE% %__msbuildArgs%
151151
IF ERRORLEVEL 1 (

0 commit comments

Comments
 (0)