[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

.azure/pipelines/ci.yml

@@ -20,16 +20,17 @@ variables:
 - name: TeamName
   value: AspNetCore
 - ${{ if eq(variables['System.TeamProject'], 'public') }}:
-  - name: BuildScriptArgs
+  - name: BuildNumberArg
     value: ''
 - ${{ if ne(variables['System.TeamProject'], 'public') }}:
-  - name: BuildScriptArgs
+  - name: BuildNumberArg
     value: '/p:BuildNumber=$(Build.BuildId)'
   - name: SharedFxArgs
     value: '/t:Prepare
             /t:Restore
             /t:GeneratePropsFiles
-            /t:BuildSharedFx'
+            /t:BuildSharedFx
+            $(BuildNumberArg)'
 
 jobs:
 - template: jobs/default-build.yml
@@ -37,22 +38,29 @@ jobs:
     jobName: Windows_Build
     jobDisplayName: "Build and test: Windows"
     agentOs: Windows
+    buildArgs: $(BuildNumberArg)
     codeSign: true
     beforeBuild:
     - powershell: "& ./src/Servers/IIS/tools/UpdateIISExpressCertificate.ps1"
       displayName: Setup IISExpress test certificates
-# Unix test jobs only run on public CI builds
-- ${{ if eq(variables['System.TeamProject'], 'public') }}:
+    # Skip tests by default in internal non-PR builds.
+    ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
+      variables:
+        PB_SKIPTESTS: ${{ coalesce(variables.PB_SKIPTESTS, 'true') }}
+# Unix test jobs only run on public CI builds and PRs
+- ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}:
   - template: jobs/default-build.yml
     parameters:
       jobName: MacOs_Build
       jobDisplayName: "Build and test : MacOS"
       agentOs: MacOS
+      buildArgs: $(BuildNumberArg)
   - template: jobs/default-build.yml
     parameters:
       jobName: Linux_Build
       jobDisplayName: "Build and test : Linux"
       agentOs: Linux
+      buildArgs: $(BuildNumberArg)
 
 - ${{ if eq(variables['System.TeamProject'], 'internal') }}:
   - job: Windows_SharedFx
@@ -67,6 +75,7 @@ jobs:
     variables:
       _SignType: real
       JAVA_HOME: $(Agent.BuildDirectory)\.tools\jdk
+      PB_SKIPTESTS: 'true'
     steps:
     - checkout: self
       clean: true
@@ -102,7 +111,6 @@ jobs:
     - script: .\build.cmd
               -ci
               /p:SignType=$(_SignType)
-              $(BuildScriptArgs)
               $(SharedFxArgs)
               /p:SharedFxRID=win-x64
               /bl:artifacts/logs/SharedFx-win-x64.binlog
@@ -118,7 +126,6 @@ jobs:
     - script: .\build.cmd
               -ci
               /p:SignType=$(_SignType)
-              $(BuildScriptArgs)
               $(SharedFxArgs)
               /p:SharedFxRID=win-x86
               /bl:artifacts/logs/SharedFx-win-x86.binlog
@@ -134,7 +141,7 @@ jobs:
     - script: .\build.cmd
               -ci
               /p:SignType=$(_SignType)
-              $(BuildScriptArgs)
+              $(BuildNumberArg)
               /p:SkipArtifactInfoTargets=true
               /p:DisableSignCheck=true
               /t:DoCodeSigning
@@ -178,6 +185,8 @@ jobs:
       clean: all
     pool:
       vmImage: macOS-10.14
+    variables:
+      PB_SKIPTESTS: 'true'
     steps:
     - checkout: self
       clean: true
@@ -198,7 +207,6 @@ jobs:
         targetFolder: $(Build.SourcesDirectory)/.deps/
     - script: ./$(BuildDirectory)/build.sh
               -ci
-              $(BuildScriptArgs)
               $(SharedFxArgs)
               /p:SharedFxRID=osx-x64
               /bl:artifacts/logs/SharedFx-osx-x64.binlog
@@ -226,6 +234,8 @@ jobs:
       clean: all
     pool:
       vmImage: ubuntu-16.04
+    variables:
+      PB_SKIPTESTS: 'true'
     steps:
     - checkout: self
       clean: true
@@ -246,7 +256,6 @@ jobs:
         targetFolder: $(Build.SourcesDirectory)/.deps/
     - script: ./$(BuildDirectory)/build.sh
               -ci
-              $(BuildScriptArgs)
               $(SharedFxArgs)
               /p:SharedFXRid=linux-x64
               /bl:artifacts/logs/SharedFx-linux-x64.binlog
@@ -258,7 +267,6 @@ jobs:
       displayName: Build linux-x64 SharedFX
     - script: ./$(BuildDirectory)/build.sh
               -ci
-              $(BuildScriptArgs)
               $(SharedFxArgs)
               /p:SharedFXRid=linux-arm
               /p:IsLinuxArmSupported=true
@@ -287,6 +295,8 @@ jobs:
       clean: all
     pool:
       vmImage: ubuntu-16.04
+    variables:
+      PB_SKIPTESTS: 'true'
     steps:
     - checkout: self
       clean: true
@@ -308,7 +318,7 @@ jobs:
     - script: ./$(BuildDirectory)/dockerbuild.sh
               alpine
               -ci
-              $(BuildScriptArgs)
+              $(BuildNumberArg)
               /t:Prepare
               /t:GeneratePropsFiles
               /t:BuildSharedFx
@@ -344,6 +354,7 @@ jobs:
     variables:
       _SignType: real
       JAVA_HOME: $(Agent.BuildDirectory)\.tools\jdk
+      PB_SKIPTESTS: 'true'
     steps:
     - checkout: self
       clean: true
@@ -421,6 +432,7 @@ jobs:
     variables:
       _SignType: real
       JAVA_HOME: $(Agent.BuildDirectory)\.tools\jdk
+      PB_SKIPTESTS: 'true'
     steps:
     - checkout: self
       clean: true
@@ -443,7 +455,7 @@ jobs:
         targetFolder: $(Build.SourcesDirectory)/.deps/Signed/
     - script: .\build.cmd
               -ci
-              $(BuildScriptArgs)
+              $(BuildNumberArg)
               /p:SignType=$(_SignType)
               /t:BuildFallbackArchive
               /bl:artifacts/logs/PackageArchive.binlog
@@ -468,7 +480,7 @@ jobs:
 
   - job: SharedFX_Installers
     displayName: Build SharedFX Installers
-    dependsOn: 
+    dependsOn:
       - Linux_SharedFx
       - Linux_Musl_SharedFx
       - MacOs_SharedFx
@@ -478,6 +490,8 @@ jobs:
       clean: all
     pool:
       vmImage: ubuntu-16.04
+    variables:
+      PB_SKIPTESTS: 'true'
     steps:
     - checkout: self
       clean: true
@@ -531,7 +545,7 @@ jobs:
         targetFolder: $(Build.SourcesDirectory)/.deps/Signed/
     - script: ./$(BuildDirectory)/build.sh
               -ci
-              $(BuildScriptArgs)
+              $(BuildNumberArg)
               /t:BuildInstallers
               /bl:artifacts/logs/SharedFx-Installers.binlog
       env:
@@ -554,7 +568,7 @@ jobs:
 
   - job: Publish
     displayName: Publish
-    dependsOn: 
+    dependsOn:
       - Windows_Installers
       - SharedFX_Installers
       - Package_Archive
@@ -567,6 +581,7 @@ jobs:
     variables:
       _SignType: real
       JAVA_HOME: $(Agent.BuildDirectory)\.tools\jdk
+      PB_SKIPTESTS: 'true'
     steps:
     - checkout: self
       clean: true
@@ -703,7 +718,7 @@ jobs:
         contents: korebuild.json
     - script: .\build.cmd
               -ci
-              $(BuildScriptArgs)
+              $(BuildNumberArg)
               /t:Publish
               /p:BuildBranch=$(Build.SourceBranchName)
               /bl:artifacts/logs/Publish.binlog

build/dependencies.props

@@ -90,10 +90,10 @@
     <MicrosoftExtensionsBuffersTestingSourcesPackageVersion>2.1.1</MicrosoftExtensionsBuffersTestingSourcesPackageVersion>
     <MicrosoftAspNetCoreHostingWebHostBuilderFactorySourcesPackageVersion>2.1.1</MicrosoftAspNetCoreHostingWebHostBuilderFactorySourcesPackageVersion>
     <MicrosoftAspNetCoreServerIntegrationTestingPackageVersion>0.5.1</MicrosoftAspNetCoreServerIntegrationTestingPackageVersion>
-    <MicrosoftEntityFrameworkCoreInMemoryPackageVersion>2.1.4</MicrosoftEntityFrameworkCoreInMemoryPackageVersion>
-    <MicrosoftEntityFrameworkCoreSqlitePackageVersion>2.1.4</MicrosoftEntityFrameworkCoreSqlitePackageVersion>
-    <MicrosoftEntityFrameworkCoreSqlServerPackageVersion>2.1.4</MicrosoftEntityFrameworkCoreSqlServerPackageVersion>
-    <MicrosoftEntityFrameworkCoreToolsPackageVersion>2.1.4</MicrosoftEntityFrameworkCoreToolsPackageVersion>
+    <MicrosoftEntityFrameworkCoreInMemoryPackageVersion>2.1.14</MicrosoftEntityFrameworkCoreInMemoryPackageVersion>
+    <MicrosoftEntityFrameworkCoreSqlitePackageVersion>2.1.14</MicrosoftEntityFrameworkCoreSqlitePackageVersion>
+    <MicrosoftEntityFrameworkCoreSqlServerPackageVersion>2.1.14</MicrosoftEntityFrameworkCoreSqlServerPackageVersion>
+    <MicrosoftEntityFrameworkCoreToolsPackageVersion>2.1.14</MicrosoftEntityFrameworkCoreToolsPackageVersion>
 
     <!-- External and partner dependencies -->
     <AngleSharpPackageVersion>0.9.9</AngleSharpPackageVersion>
@@ -132,11 +132,11 @@
     <MicrosoftIdentityModelClientsActiveDirectoryPackageVersion>3.14.2</MicrosoftIdentityModelClientsActiveDirectoryPackageVersion>
     <MicrosoftIdentityModelProtocolsOpenIdConnectPackageVersion>5.2.0</MicrosoftIdentityModelProtocolsOpenIdConnectPackageVersion>
     <MicrosoftIdentityModelProtocolsWsFederationPackageVersion>5.2.0</MicrosoftIdentityModelProtocolsWsFederationPackageVersion>
-    <MicrosoftNETCoreApp10PackageVersion>1.0.15</MicrosoftNETCoreApp10PackageVersion>
-    <MicrosoftNETCoreApp11PackageVersion>1.1.12</MicrosoftNETCoreApp11PackageVersion>
+    <MicrosoftNETCoreApp10PackageVersion>1.0.16</MicrosoftNETCoreApp10PackageVersion>
+    <MicrosoftNETCoreApp11PackageVersion>1.1.13</MicrosoftNETCoreApp11PackageVersion>
     <MicrosoftNETCoreApp20PackageVersion>2.0.9</MicrosoftNETCoreApp20PackageVersion>
     <MicrosoftNETCoreWindowsApiSetsPackageVersion>1.0.1</MicrosoftNETCoreWindowsApiSetsPackageVersion>
-    <MicrosoftNETTestSdkPackageVersion>15.9.0</MicrosoftNETTestSdkPackageVersion>
+    <MicrosoftNETTestSdkPackageVersion>15.9.2</MicrosoftNETTestSdkPackageVersion>
     <MicrosoftOwinSecurityCookiesPackageVersion>3.0.1</MicrosoftOwinSecurityCookiesPackageVersion>
     <MicrosoftOwinSecurityPackageVersion>3.0.1</MicrosoftOwinSecurityPackageVersion>
     <MicrosoftOwinTestingPackageVersion>3.0.1</MicrosoftOwinTestingPackageVersion>
@@ -191,7 +191,7 @@
     <SystemIOPipelinesPackageVersion>4.5.4</SystemIOPipelinesPackageVersion>
     <SystemMemoryPackageVersion>4.5.4</SystemMemoryPackageVersion>
     <SystemNetHttpPackageVersion>4.3.4</SystemNetHttpPackageVersion>
-    <SystemNetHttpWinHttpHandlerPackageVersion>4.5.3</SystemNetHttpWinHttpHandlerPackageVersion>
+    <SystemNetHttpWinHttpHandlerPackageVersion>4.5.4</SystemNetHttpWinHttpHandlerPackageVersion>
     <SystemNumericsVectorsPackageVersion>4.5.0</SystemNumericsVectorsPackageVersion>
     <SystemReactiveLinqPackageVersion>3.1.1</SystemReactiveLinqPackageVersion>
     <SystemReflectionEmitPackageVersion>4.3.0</SystemReflectionEmitPackageVersion>
@@ -230,5 +230,10 @@
     <XunitExtensibilityExecutionPackageVersion>2.3.1</XunitExtensibilityExecutionPackageVersion>
     <XunitPackageVersion>2.4.0</XunitPackageVersion>
     <XunitRunnerVisualStudioPackageVersion>2.4.0</XunitRunnerVisualStudioPackageVersion>
+
+    <!-- Dependencies listed only to include otherwise-transitive references in Microsoft.AspNetCore.App.nuspec. -->
+    <MicrosoftDotNetPlatformAbstractionsPackageVersion>2.1.0</MicrosoftDotNetPlatformAbstractionsPackageVersion>
+    <SystemSecurityCryptographyPkcsPackageVersion>4.5.2</SystemSecurityCryptographyPkcsPackageVersion>
+    <SystemTextEncodingCodePagesPackageVersion>4.5.1</SystemTextEncodingCodePagesPackageVersion>
   </PropertyGroup>
 </Project>