Skip to content

Commit bffb3ca

Browse files
dougbudougbu
authored
[release/2.1] Include transitive refs in meta-package .nuspec files (#30639)
* Correct and streamline internal builds - correct manual internal builds - need to explicitly set `$(BuildNumber)` property in all build steps - rename `$(BuildScriptArgs)` to avoid circular reference - skip tests by default in internal non-PR builds nits: - include new `$(BuildNumberArg)` in `$(SharedFxArgs)` - run all test jobs in internal pull requests * Always skip tests in SharedFx and later jobs - however test\SharedFx.UnitTests\SharedFx.UnitTests.csproj always runs as part of `BuildSharedFx` target * Include transitive refs in meta-package .nuspec files - #30279 - ensure dependencies are up-to-date even when PatchConfig.props is empty - change only CoreFx and core-setup dependencies - also change transitive references that weren't mentioned before * Bump a few patch versions
1 parent b9baf8c commit bffb3ca

File tree

3 files changed

+97
-72
lines changed

3 files changed

+97
-72
lines changed

‎.azure/pipelines/ci.yml

Lines changed: 32 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -20,39 +20,47 @@ variables:
2020
- name: TeamName
2121
value: AspNetCore
2222
- ${{ if eq(variables['System.TeamProject'], 'public') }}:
23-
- name: BuildScriptArgs
23+
- name: BuildNumberArg
2424
value: ''
2525
- ${{ if ne(variables['System.TeamProject'], 'public') }}:
26-
- name: BuildScriptArgs
26+
- name: BuildNumberArg
2727
value: '/p:BuildNumber=$(Build.BuildId)'
2828
- name: SharedFxArgs
2929
value: '/t:Prepare
3030
/t:Restore
3131
/t:GeneratePropsFiles
32-
/t:BuildSharedFx'
32+
/t:BuildSharedFx
33+
$(BuildNumberArg)'
3334

3435
jobs:
3536
- template: jobs/default-build.yml
3637
parameters:
3738
jobName: Windows_Build
3839
jobDisplayName: "Build and test: Windows"
3940
agentOs: Windows
41+
buildArgs: $(BuildNumberArg)
4042
codeSign: true
4143
beforeBuild:
4244
- powershell: "& ./src/Servers/IIS/tools/UpdateIISExpressCertificate.ps1"
4345
displayName: Setup IISExpress test certificates
44-
# Unix test jobs only run on public CI builds
45-
- ${{ if eq(variables['System.TeamProject'], 'public') }}:
46+
# Skip tests by default in internal non-PR builds.
47+
${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
48+
variables:
49+
PB_SKIPTESTS: ${{ coalesce(variables.PB_SKIPTESTS, 'true') }}
50+
# Unix test jobs only run on public CI builds and PRs
51+
- ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}:
4652
- template: jobs/default-build.yml
4753
parameters:
4854
jobName: MacOs_Build
4955
jobDisplayName: "Build and test : MacOS"
5056
agentOs: MacOS
57+
buildArgs: $(BuildNumberArg)
5158
- template: jobs/default-build.yml
5259
parameters:
5360
jobName: Linux_Build
5461
jobDisplayName: "Build and test : Linux"
5562
agentOs: Linux
63+
buildArgs: $(BuildNumberArg)
5664

5765
- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
5866
- job: Windows_SharedFx
@@ -67,6 +75,7 @@ jobs:
6775
variables:
6876
_SignType: real
6977
JAVA_HOME: $(Agent.BuildDirectory)\.tools\jdk
78+
PB_SKIPTESTS: 'true'
7079
steps:
7180
- checkout: self
7281
clean: true
@@ -102,7 +111,6 @@ jobs:
102111
- script: .\build.cmd
103112
-ci
104113
/p:SignType=$(_SignType)
105-
$(BuildScriptArgs)
106114
$(SharedFxArgs)
107115
/p:SharedFxRID=win-x64
108116
/bl:artifacts/logs/SharedFx-win-x64.binlog
@@ -118,7 +126,6 @@ jobs:
118126
- script: .\build.cmd
119127
-ci
120128
/p:SignType=$(_SignType)
121-
$(BuildScriptArgs)
122129
$(SharedFxArgs)
123130
/p:SharedFxRID=win-x86
124131
/bl:artifacts/logs/SharedFx-win-x86.binlog
@@ -134,7 +141,7 @@ jobs:
134141
- script: .\build.cmd
135142
-ci
136143
/p:SignType=$(_SignType)
137-
$(BuildScriptArgs)
144+
$(BuildNumberArg)
138145
/p:SkipArtifactInfoTargets=true
139146
/p:DisableSignCheck=true
140147
/t:DoCodeSigning
@@ -178,6 +185,8 @@ jobs:
178185
clean: all
179186
pool:
180187
vmImage: macOS-10.14
188+
variables:
189+
PB_SKIPTESTS: 'true'
181190
steps:
182191
- checkout: self
183192
clean: true
@@ -198,7 +207,6 @@ jobs:
198207
targetFolder: $(Build.SourcesDirectory)/.deps/
199208
- script: ./$(BuildDirectory)/build.sh
200209
-ci
201-
$(BuildScriptArgs)
202210
$(SharedFxArgs)
203211
/p:SharedFxRID=osx-x64
204212
/bl:artifacts/logs/SharedFx-osx-x64.binlog
@@ -226,6 +234,8 @@ jobs:
226234
clean: all
227235
pool:
228236
vmImage: ubuntu-16.04
237+
variables:
238+
PB_SKIPTESTS: 'true'
229239
steps:
230240
- checkout: self
231241
clean: true
@@ -246,7 +256,6 @@ jobs:
246256
targetFolder: $(Build.SourcesDirectory)/.deps/
247257
- script: ./$(BuildDirectory)/build.sh
248258
-ci
249-
$(BuildScriptArgs)
250259
$(SharedFxArgs)
251260
/p:SharedFXRid=linux-x64
252261
/bl:artifacts/logs/SharedFx-linux-x64.binlog
@@ -258,7 +267,6 @@ jobs:
258267
displayName: Build linux-x64 SharedFX
259268
- script: ./$(BuildDirectory)/build.sh
260269
-ci
261-
$(BuildScriptArgs)
262270
$(SharedFxArgs)
263271
/p:SharedFXRid=linux-arm
264272
/p:IsLinuxArmSupported=true
@@ -287,6 +295,8 @@ jobs:
287295
clean: all
288296
pool:
289297
vmImage: ubuntu-16.04
298+
variables:
299+
PB_SKIPTESTS: 'true'
290300
steps:
291301
- checkout: self
292302
clean: true
@@ -308,7 +318,7 @@ jobs:
308318
- script: ./$(BuildDirectory)/dockerbuild.sh
309319
alpine
310320
-ci
311-
$(BuildScriptArgs)
321+
$(BuildNumberArg)
312322
/t:Prepare
313323
/t:GeneratePropsFiles
314324
/t:BuildSharedFx
@@ -344,6 +354,7 @@ jobs:
344354
variables:
345355
_SignType: real
346356
JAVA_HOME: $(Agent.BuildDirectory)\.tools\jdk
357+
PB_SKIPTESTS: 'true'
347358
steps:
348359
- checkout: self
349360
clean: true
@@ -421,6 +432,7 @@ jobs:
421432
variables:
422433
_SignType: real
423434
JAVA_HOME: $(Agent.BuildDirectory)\.tools\jdk
435+
PB_SKIPTESTS: 'true'
424436
steps:
425437
- checkout: self
426438
clean: true
@@ -443,7 +455,7 @@ jobs:
443455
targetFolder: $(Build.SourcesDirectory)/.deps/Signed/
444456
- script: .\build.cmd
445457
-ci
446-
$(BuildScriptArgs)
458+
$(BuildNumberArg)
447459
/p:SignType=$(_SignType)
448460
/t:BuildFallbackArchive
449461
/bl:artifacts/logs/PackageArchive.binlog
@@ -468,7 +480,7 @@ jobs:
468480

469481
- job: SharedFX_Installers
470482
displayName: Build SharedFX Installers
471-
dependsOn:
483+
dependsOn:
472484
- Linux_SharedFx
473485
- Linux_Musl_SharedFx
474486
- MacOs_SharedFx
@@ -478,6 +490,8 @@ jobs:
478490
clean: all
479491
pool:
480492
vmImage: ubuntu-16.04
493+
variables:
494+
PB_SKIPTESTS: 'true'
481495
steps:
482496
- checkout: self
483497
clean: true
@@ -531,7 +545,7 @@ jobs:
531545
targetFolder: $(Build.SourcesDirectory)/.deps/Signed/
532546
- script: ./$(BuildDirectory)/build.sh
533547
-ci
534-
$(BuildScriptArgs)
548+
$(BuildNumberArg)
535549
/t:BuildInstallers
536550
/bl:artifacts/logs/SharedFx-Installers.binlog
537551
env:
@@ -554,7 +568,7 @@ jobs:
554568

555569
- job: Publish
556570
displayName: Publish
557-
dependsOn:
571+
dependsOn:
558572
- Windows_Installers
559573
- SharedFX_Installers
560574
- Package_Archive
@@ -567,6 +581,7 @@ jobs:
567581
variables:
568582
_SignType: real
569583
JAVA_HOME: $(Agent.BuildDirectory)\.tools\jdk
584+
PB_SKIPTESTS: 'true'
570585
steps:
571586
- checkout: self
572587
clean: true
@@ -703,7 +718,7 @@ jobs:
703718
contents: korebuild.json
704719
- script: .\build.cmd
705720
-ci
706-
$(BuildScriptArgs)
721+
$(BuildNumberArg)
707722
/t:Publish
708723
/p:BuildBranch=$(Build.SourceBranchName)
709724
/bl:artifacts/logs/Publish.binlog

‎build/dependencies.props

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -90,10 +90,10 @@
9090
<MicrosoftExtensionsBuffersTestingSourcesPackageVersion>2.1.1</MicrosoftExtensionsBuffersTestingSourcesPackageVersion>
9191
<MicrosoftAspNetCoreHostingWebHostBuilderFactorySourcesPackageVersion>2.1.1</MicrosoftAspNetCoreHostingWebHostBuilderFactorySourcesPackageVersion>
9292
<MicrosoftAspNetCoreServerIntegrationTestingPackageVersion>0.5.1</MicrosoftAspNetCoreServerIntegrationTestingPackageVersion>
93-
<MicrosoftEntityFrameworkCoreInMemoryPackageVersion>2.1.4</MicrosoftEntityFrameworkCoreInMemoryPackageVersion>
94-
<MicrosoftEntityFrameworkCoreSqlitePackageVersion>2.1.4</MicrosoftEntityFrameworkCoreSqlitePackageVersion>
95-
<MicrosoftEntityFrameworkCoreSqlServerPackageVersion>2.1.4</MicrosoftEntityFrameworkCoreSqlServerPackageVersion>
96-
<MicrosoftEntityFrameworkCoreToolsPackageVersion>2.1.4</MicrosoftEntityFrameworkCoreToolsPackageVersion>
93+
<MicrosoftEntityFrameworkCoreInMemoryPackageVersion>2.1.14</MicrosoftEntityFrameworkCoreInMemoryPackageVersion>
94+
<MicrosoftEntityFrameworkCoreSqlitePackageVersion>2.1.14</MicrosoftEntityFrameworkCoreSqlitePackageVersion>
95+
<MicrosoftEntityFrameworkCoreSqlServerPackageVersion>2.1.14</MicrosoftEntityFrameworkCoreSqlServerPackageVersion>
96+
<MicrosoftEntityFrameworkCoreToolsPackageVersion>2.1.14</MicrosoftEntityFrameworkCoreToolsPackageVersion>
9797

9898
<!-- External and partner dependencies -->
9999
<AngleSharpPackageVersion>0.9.9</AngleSharpPackageVersion>
@@ -132,11 +132,11 @@
132132
<MicrosoftIdentityModelClientsActiveDirectoryPackageVersion>3.14.2</MicrosoftIdentityModelClientsActiveDirectoryPackageVersion>
133133
<MicrosoftIdentityModelProtocolsOpenIdConnectPackageVersion>5.2.0</MicrosoftIdentityModelProtocolsOpenIdConnectPackageVersion>
134134
<MicrosoftIdentityModelProtocolsWsFederationPackageVersion>5.2.0</MicrosoftIdentityModelProtocolsWsFederationPackageVersion>
135-
<MicrosoftNETCoreApp10PackageVersion>1.0.15</MicrosoftNETCoreApp10PackageVersion>
136-
<MicrosoftNETCoreApp11PackageVersion>1.1.12</MicrosoftNETCoreApp11PackageVersion>
135+
<MicrosoftNETCoreApp10PackageVersion>1.0.16</MicrosoftNETCoreApp10PackageVersion>
136+
<MicrosoftNETCoreApp11PackageVersion>1.1.13</MicrosoftNETCoreApp11PackageVersion>
137137
<MicrosoftNETCoreApp20PackageVersion>2.0.9</MicrosoftNETCoreApp20PackageVersion>
138138
<MicrosoftNETCoreWindowsApiSetsPackageVersion>1.0.1</MicrosoftNETCoreWindowsApiSetsPackageVersion>
139-
<MicrosoftNETTestSdkPackageVersion>15.9.0</MicrosoftNETTestSdkPackageVersion>
139+
<MicrosoftNETTestSdkPackageVersion>15.9.2</MicrosoftNETTestSdkPackageVersion>
140140
<MicrosoftOwinSecurityCookiesPackageVersion>3.0.1</MicrosoftOwinSecurityCookiesPackageVersion>
141141
<MicrosoftOwinSecurityPackageVersion>3.0.1</MicrosoftOwinSecurityPackageVersion>
142142
<MicrosoftOwinTestingPackageVersion>3.0.1</MicrosoftOwinTestingPackageVersion>
@@ -191,7 +191,7 @@
191191
<SystemIOPipelinesPackageVersion>4.5.4</SystemIOPipelinesPackageVersion>
192192
<SystemMemoryPackageVersion>4.5.4</SystemMemoryPackageVersion>
193193
<SystemNetHttpPackageVersion>4.3.4</SystemNetHttpPackageVersion>
194-
<SystemNetHttpWinHttpHandlerPackageVersion>4.5.3</SystemNetHttpWinHttpHandlerPackageVersion>
194+
<SystemNetHttpWinHttpHandlerPackageVersion>4.5.4</SystemNetHttpWinHttpHandlerPackageVersion>
195195
<SystemNumericsVectorsPackageVersion>4.5.0</SystemNumericsVectorsPackageVersion>
196196
<SystemReactiveLinqPackageVersion>3.1.1</SystemReactiveLinqPackageVersion>
197197
<SystemReflectionEmitPackageVersion>4.3.0</SystemReflectionEmitPackageVersion>
@@ -230,5 +230,10 @@
230230
<XunitExtensibilityExecutionPackageVersion>2.3.1</XunitExtensibilityExecutionPackageVersion>
231231
<XunitPackageVersion>2.4.0</XunitPackageVersion>
232232
<XunitRunnerVisualStudioPackageVersion>2.4.0</XunitRunnerVisualStudioPackageVersion>
233+
234+
<!-- Dependencies listed only to include otherwise-transitive references in Microsoft.AspNetCore.App.nuspec. -->
235+
<MicrosoftDotNetPlatformAbstractionsPackageVersion>2.1.0</MicrosoftDotNetPlatformAbstractionsPackageVersion>
236+
<SystemSecurityCryptographyPkcsPackageVersion>4.5.2</SystemSecurityCryptographyPkcsPackageVersion>
237+
<SystemTextEncodingCodePagesPackageVersion>4.5.1</SystemTextEncodingCodePagesPackageVersion>
233238
</PropertyGroup>
234239
</Project>

0 commit comments

Comments
 (0)