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

dougbu · 2021-03-04T06:30:26Z

2.1 Reference resolution project fails to add patched CoreFx assembly to Microsoft.Aspnetcore.App #30279
ensure dependencies are up-to-date even when PatchConfig.props is empty
also includes 5bafa2d from [release/2.1] Fixup NPM package versioning #30164

Pilchie · 2021-03-04T19:56:11Z

Does this mean we'll publish a new version of the meta-packages for all patches, with their dependencies flattened?

I'm not against that (it makes things much better for people using 2.1 on .NET Framework for instance, but in the past there were some concerns about needing to update templates, and that affecting the offline package cache size in the SDK, etc.

dougbu · 2021-03-04T23:53:57Z

@Pilchie our 2.1 builds always produce the two meta-packages. This will flatten only flatten dependencies from dotnet/CoreFx and dotnet/core-setup once it's ready for review. Basically, it'll be similar to the 3.1 and 5.0 special cases we have for some dotnet/runtime repos e.g. https://github.com/dotnet/aspnetcore/blob/release/5.0/eng/Versions.props#L173-L186

~~For now, this PR is~~

~~Not inclusive enough because it doesn't cover a few dotnet/CoreFx and dotnet/core-setup dependencies that are not yet referenced directly anywhere~~
Too inclusive because I updated a bunch of third-party dependencies that land in our meta-packages but are highly unlikely to get new versions we worry about. My preference here is to change their handling only if we need to react to security issues in those dependencies.

dougbu · 2021-03-08T03:08:05Z

~~Real test will be https://dev.azure.com/dnceng/internal/_build/results?buildId=1026812~~

dougbu · 2021-03-08T06:45:11Z

Waiting for #30729 to work. Looks as if only ProdCon builds work internally for release/2.1☹️ (https://dev.azure.com/dnceng/internal/_build/results?buildId=1026812 included a mess of unexpected errors)

dougbu · 2021-03-10T00:44:06Z

~~Do not merge pro-actively. Will rebase on #30729 commits to enable internal testing and validate that.~~

- 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

- however test\SharedFx.UnitTests\SharedFx.UnitTests.csproj always runs as part of `BuildSharedFx` target

- #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

dougbu · 2021-03-12T18:39:16Z

Confirmed this PR does what it says on the tin by comparing https://dev.azure.com/dnceng/internal/_build/results?buildId=1034483 artifacts with our 2.1.25 release. The Microsoft.AspNetCore.App.nuspec file now contains the transitive references from dotnet/CoreFx and dotnet/core-setup.

In last push, I removed #30729 fixes that matter only between branding and baseline updates.

dougbu · 2021-03-12T18:50:11Z

Can't add reviewers, likely due to GitHub outage. Please review @dotnet/aspnet-build

dougbu · 2021-03-12T18:50:40Z

Working again 😀

wtgodbe · 2021-03-12T18:52:18Z

build/dependencies.props

@@ -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>


Are these all the latest?

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

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

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

wtgodbe

Seems reasonable

dougbu · 2021-03-12T20:37:02Z

build/dependencies.props

+    <MicrosoftNETCoreApp10PackageVersion>1.0.16</MicrosoftNETCoreApp10PackageVersion>
+    <MicrosoftNETCoreApp11PackageVersion>1.1.13</MicrosoftNETCoreApp11PackageVersion>


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

dougbu · 2021-03-12T20:38:29Z

build/dependencies.props

    <MicrosoftNETCoreApp20PackageVersion>2.0.9</MicrosoftNETCoreApp20PackageVersion>
    <MicrosoftNETCoreWindowsApiSetsPackageVersion>1.0.1</MicrosoftNETCoreWindowsApiSetsPackageVersion>
-    <MicrosoftNETTestSdkPackageVersion>15.9.0</MicrosoftNETTestSdkPackageVersion>
+    <MicrosoftNETTestSdkPackageVersion>15.9.2</MicrosoftNETTestSdkPackageVersion>


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

dougbu · 2021-03-12T20:39:36Z

build/dependencies.props

@@ -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>


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

- left 3 new transitive dependencies out of #30639

Pilchie added the area-infrastructure Includes: MSBuild projects/targets, build scripts, CI, Installers and shared framework label Mar 4, 2021

dougbu force-pushed the dougbu/meta.package.nuspec branch from 56b658c to 2769437 Compare March 8, 2021 02:56

dougbu added the tell-mode Indicates a PR which is being merged during tell-mode label Mar 8, 2021

dougbu changed the title ~~Include transitive refs in meta-package .nuspec files~~ [release/2.1] Include transitive refs in meta-package .nuspec files Mar 8, 2021

dougbu mentioned this pull request Mar 8, 2021

[release/2.1] Correct and streamline internal builds #30729

Closed

dougbu added 3 commits March 11, 2021 12:19

Always skip tests in SharedFx and later jobs

9abd18f

- however test\SharedFx.UnitTests\SharedFx.UnitTests.csproj always runs as part of `BuildSharedFx` target

Include transitive refs in meta-package .nuspec files

d06bde9

- #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

dougbu force-pushed the dougbu/meta.package.nuspec branch from 487b359 to d06bde9 Compare March 12, 2021 18:15

dougbu marked this pull request as ready for review March 12, 2021 18:20

dougbu requested a review from a team March 12, 2021 18:50

wtgodbe reviewed Mar 12, 2021

View reviewed changes

wtgodbe approved these changes Mar 12, 2021

View reviewed changes

Bump a few patch versions

a8bc477

dougbu commented Mar 12, 2021

View reviewed changes

dougbu merged commit bffb3ca into release/2.1 Mar 12, 2021

dougbu deleted the dougbu/meta.package.nuspec branch March 12, 2021 22:02

dougbu added a commit that referenced this pull request Mar 12, 2021

Add a bit more to Microsoft.AspNetCore.App.nuspec

76faf4a

- left 3 new transitive dependencies out of #30639

dougbu mentioned this pull request Mar 12, 2021

Add a bit more to Microsoft.AspNetCore.App.nuspec #30895

Merged

dougbu added this to the 2.1.27 milestone Mar 12, 2021

dougbu added a commit that referenced this pull request Mar 12, 2021

Add a bit more to Microsoft.AspNetCore.App.nuspec (#30895)

fd7ee03

- left 3 new transitive dependencies out of #30639

		<MicrosoftNETCoreApp10PackageVersion>1.0.16</MicrosoftNETCoreApp10PackageVersion>
		<MicrosoftNETCoreApp11PackageVersion>1.1.13</MicrosoftNETCoreApp11PackageVersion>

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

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

Uh oh!

Conversation

dougbu commented Mar 4, 2021

Uh oh!

Pilchie commented Mar 4, 2021

Uh oh!

dougbu commented Mar 4, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

dougbu commented Mar 8, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

dougbu commented Mar 8, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

dougbu commented Mar 10, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

dougbu commented Mar 12, 2021

Uh oh!

dougbu commented Mar 12, 2021

Uh oh!

dougbu commented Mar 12, 2021

Uh oh!

wtgodbe Mar 12, 2021

Choose a reason for hiding this comment

Uh oh!

dougbu Mar 12, 2021

Choose a reason for hiding this comment

Uh oh!

wtgodbe Mar 12, 2021

Choose a reason for hiding this comment

Uh oh!

dougbu Mar 12, 2021

Choose a reason for hiding this comment

Uh oh!

wtgodbe left a comment

Choose a reason for hiding this comment

Uh oh!

dougbu Mar 12, 2021

Choose a reason for hiding this comment

Uh oh!

dougbu Mar 12, 2021

Choose a reason for hiding this comment

Uh oh!

dougbu Mar 12, 2021

Choose a reason for hiding this comment

Uh oh!

Uh oh!

dougbu commented Mar 4, 2021 •

edited

Loading

dougbu commented Mar 8, 2021 •

edited

Loading

dougbu commented Mar 8, 2021 •

edited

Loading

dougbu commented Mar 10, 2021 •

edited

Loading