Skip to content

[release/2.1] Include transitive refs in meta-package .nuspec files #30639

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Mar 12, 2021
Merged

[release/2.1] Include transitive refs in meta-package .nuspec files #30639

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b627355
Correct and streamline internal builds
dougbu Mar 8, 2021
9abd18f
Always skip tests in SharedFx and later jobs
dougbu Mar 8, 2021
d06bde9
Include transitive refs in meta-package .nuspec files
dougbu Mar 4, 2021
a8bc477
Bump a few patch versions
dougbu Mar 12, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 32 additions & 17 deletions .azure/pipelines/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,39 +20,47 @@ 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
parameters:
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
Expand All @@ -67,6 +75,7 @@ jobs:
variables:
_SignType: real
JAVA_HOME: $(Agent.BuildDirectory)\.tools\jdk
PB_SKIPTESTS: 'true'
steps:
- checkout: self
clean: true
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand All @@ -134,7 +141,7 @@ jobs:
- script: .\build.cmd
-ci
/p:SignType=$(_SignType)
$(BuildScriptArgs)
$(BuildNumberArg)
/p:SkipArtifactInfoTargets=true
/p:DisableSignCheck=true
/t:DoCodeSigning
Expand Down Expand Up @@ -178,6 +185,8 @@ jobs:
clean: all
pool:
vmImage: macOS-10.14
variables:
PB_SKIPTESTS: 'true'
steps:
- checkout: self
clean: true
Expand All @@ -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
Expand Down Expand Up @@ -226,6 +234,8 @@ jobs:
clean: all
pool:
vmImage: ubuntu-16.04
variables:
PB_SKIPTESTS: 'true'
steps:
- checkout: self
clean: true
Expand All @@ -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
Expand All @@ -258,7 +267,6 @@ jobs:
displayName: Build linux-x64 SharedFX
- script: ./$(BuildDirectory)/build.sh
-ci
$(BuildScriptArgs)
$(SharedFxArgs)
/p:SharedFXRid=linux-arm
/p:IsLinuxArmSupported=true
Expand Down Expand Up @@ -287,6 +295,8 @@ jobs:
clean: all
pool:
vmImage: ubuntu-16.04
variables:
PB_SKIPTESTS: 'true'
steps:
- checkout: self
clean: true
Expand All @@ -308,7 +318,7 @@ jobs:
- script: ./$(BuildDirectory)/dockerbuild.sh
alpine
-ci
$(BuildScriptArgs)
$(BuildNumberArg)
/t:Prepare
/t:GeneratePropsFiles
/t:BuildSharedFx
Expand Down Expand Up @@ -344,6 +354,7 @@ jobs:
variables:
_SignType: real
JAVA_HOME: $(Agent.BuildDirectory)\.tools\jdk
PB_SKIPTESTS: 'true'
steps:
- checkout: self
clean: true
Expand Down Expand Up @@ -421,6 +432,7 @@ jobs:
variables:
_SignType: real
JAVA_HOME: $(Agent.BuildDirectory)\.tools\jdk
PB_SKIPTESTS: 'true'
steps:
- checkout: self
clean: true
Expand All @@ -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
Expand All @@ -468,7 +480,7 @@ jobs:

- job: SharedFX_Installers
displayName: Build SharedFX Installers
dependsOn:
dependsOn:
- Linux_SharedFx
- Linux_Musl_SharedFx
- MacOs_SharedFx
Expand All @@ -478,6 +490,8 @@ jobs:
clean: all
pool:
vmImage: ubuntu-16.04
variables:
PB_SKIPTESTS: 'true'
steps:
- checkout: self
clean: true
Expand Down Expand Up @@ -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:
Expand All @@ -554,7 +568,7 @@ jobs:

- job: Publish
displayName: Publish
dependsOn:
dependsOn:
- Windows_Installers
- SharedFX_Installers
- Package_Archive
Expand All @@ -567,6 +581,7 @@ jobs:
variables:
_SignType: real
JAVA_HOME: $(Agent.BuildDirectory)\.tools\jdk
PB_SKIPTESTS: 'true'
steps:
- checkout: self
clean: true
Expand Down Expand Up @@ -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
Expand Down
21 changes: 13 additions & 8 deletions build/dependencies.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Comment on lines +135 to +136
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These two version variables are only mentioned in external-dependencies.props but I don't want to mess with deleting them

<MicrosoftNETCoreApp20PackageVersion>2.0.9</MicrosoftNETCoreApp20PackageVersion>
<MicrosoftNETCoreWindowsApiSetsPackageVersion>1.0.1</MicrosoftNETCoreWindowsApiSetsPackageVersion>
<MicrosoftNETTestSdkPackageVersion>15.9.0</MicrosoftNETTestSdkPackageVersion>
<MicrosoftNETTestSdkPackageVersion>15.9.2</MicrosoftNETTestSdkPackageVersion>
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This and $(SystemNetHttpWinHttpHandlerPackageVersion) may only matter in tests. They just got caught in my NuGet checkification

<MicrosoftOwinSecurityCookiesPackageVersion>3.0.1</MicrosoftOwinSecurityCookiesPackageVersion>
<MicrosoftOwinSecurityPackageVersion>3.0.1</MicrosoftOwinSecurityPackageVersion>
<MicrosoftOwinTestingPackageVersion>3.0.1</MicrosoftOwinTestingPackageVersion>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are these all the latest?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No. The two below are out-of-date. Should I check Microsoft.Extensions.DependencyModel and all of the System.* packages above❔

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, it'd be better to have the latest for everything

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Agreed though I didn't check everything in this file and instead focused on packages CoreFx, core-setup, extensions, and efcore

<SystemSecurityCryptographyPkcsPackageVersion>4.5.2</SystemSecurityCryptographyPkcsPackageVersion>
<SystemTextEncodingCodePagesPackageVersion>4.5.1</SystemTextEncodingCodePagesPackageVersion>
</PropertyGroup>
</Project>
Loading