Skip to content
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.

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

[main] Update dependencies from dotnet/arcade #17473

Merged
merged 8 commits into from
Oct 19, 2023

Conversation

dotnet-maestro[bot]
Copy link

@dotnet-maestro dotnet-maestro bot commented Oct 5, 2023

This pull request updates the following dependencies

Coherency Updates

The following updates ensure that dependencies with a CoherentParentDependency
attribute were produced in a build used as input to the parent dependency's build.
See Dependency Description Format

  • Coherency Updates:
    • Microsoft.WindowsDesktop.App.Ref: from 9.0.0-alpha.1.23456.3 to 9.0.0-alpha.1.23471.7 (parent: Microsoft.NET.Sdk)
    • VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0: from 9.0.0-alpha.1.23456.3 to 9.0.0-alpha.1.23471.7 (parent: Microsoft.NET.Sdk)
    • VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0: from 9.0.0-alpha.1.23456.3 to 9.0.0-alpha.1.23471.7 (parent: Microsoft.NET.Sdk)
    • VS.Redist.Common.NetCore.TargetingPack.x64.9.0: from 9.0.0-alpha.1.23470.1 to 9.0.0-alpha.1.23470.17 (parent: Microsoft.NET.Sdk)
    • Microsoft.WindowsDesktop.App.Runtime.win-x64: from 9.0.0-alpha.1.23456.3 to 9.0.0-alpha.1.23471.7 (parent: Microsoft.NET.Sdk)
    • Microsoft.WindowsDesktop.App.Runtime.win-x64: from 9.0.0-alpha.1.23456.3 to 9.0.0-alpha.1.23471.7 (parent: Microsoft.NET.Sdk)
    • Microsoft.FSharp.Compiler: from 12.8.0-beta.23470.1 to 12.8.0-beta.23475.2 (parent: Microsoft.NET.Sdk)
    • Microsoft.SourceBuild.Intermediate.fsharp: from 8.0.100-beta.23470.1 to 8.0.100-beta.23475.2 (parent: Microsoft.NET.Sdk)
    • Microsoft.Net.Compilers.Toolset: from 4.8.0-3.23470.12 to 4.8.0-3.23477.1 (parent: Microsoft.NET.Sdk)
    • Microsoft.Build: from 17.8.0-preview-23469-05 to 17.8.0 (parent: Microsoft.NET.Sdk)
    • NuGet.Build.Tasks: from 6.8.0-rc.112 to 6.8.0-rc.122 (parent: Microsoft.NET.Sdk)
    • Microsoft.DotNet.XliffTasks: from 1.0.0-beta.23426.1 to 1.0.0-beta.23516.1 (parent: Microsoft.DotNet.Arcade.Sdk)

From https://github.com/dotnet/arcade

  • Subscription: 7787dd03-cbf4-4297-391c-08d8e9750bf8
  • Build: 20231018.2
  • Date Produced: October 19, 2023 4:42:16 AM UTC
  • Commit: 6a5ca678aef84f34a1fccc46f76623f41da56553
  • Branch: refs/heads/main

@akoeplinger
Copy link
Member

@ViktorHofer the error here looks like it might be related to your arcade PR dotnet/arcade#14036

test/EndToEnd/EndToEnd.Tests.csproj(0,0): error NU1608: (NETCORE_ENGINEERING_TELEMETRY=Restore) Warning As Error: Detected package version outside of dependency constraint: xunit 2.4.2 requires xunit.core (= 2.4.2) but version xunit.core 2.5.1 was resolved.

@ViktorHofer ViktorHofer requested a review from a team as a code owner October 8, 2023 15:18
@ViktorHofer
Copy link
Member

This was related to the installer repository manually defining the xunit version for a project while arcade bringing in another version via the Arcade.Sdk. I pushed a commit with a minimal fix (update the xunit version by using the msbuild property).

@ViktorHofer
Copy link
Member

ViktorHofer commented Oct 8, 2023

.nuget/packages/microsoft.dotnet.arcade.sdk/9.0.0-beta.23506.2/tools/Tools.proj(0,0): error NU1102: (NETCORE_ENGINEERING_TELEMETRY=Restore) Unable to find package Microsoft.SourceBuild.Intermediate.msbuild with version (= 17.8.0)

@mthalman @MichaelSimons any idea why this failures is showing up in an arcade dependency update PR?

/vmr/src/arcade/artifacts/source-build/self/src/src/Microsoft.DotNet.SharedFramework.Sdk/Microsoft.DotNet.SharedFramework.Sdk.csproj(0,0): error NU1109: (NETCORE_ENGINEERING_TELEMETRY=Restore) Detected package downgrade: System.Text.Encodings.Web from 8.0.0-rc.1.23381.3 to centrally defined 8.0.0-preview.4.23259.5. Update the centrally managed package version to a higher version.
Microsoft.DotNet.SharedFramework.Sdk -> Microsoft.Extensions.DependencyModel 8.0.0-rc.1.23381.3 -> System.Text.Encodings.Web (>= 8.0.0-rc.1.23381.3)
Microsoft.DotNet.SharedFramework.Sdk -> System.Text.Encodings.Web (>= 8.0.0-preview.4.23259.5)

image

Looks like the DependencyModel dependency is updated but the transitives (System.Text.Json and System.Text.Encodings.Web.) aren't. This is happening because of: https://github.com/dotnet/arcade/blob/822f095b8c815dd7b9161140a9ff8151de593f82/eng/Version.Details.xml#L77C52-L83

What's the recommendation here? Should we add Version.Details.xml entries for those two dependencies to arcade? Submitted dotnet/arcade#14093

ViktorHofer added a commit to dotnet/arcade that referenced this pull request Oct 8, 2023
Unblocks ingestion into dotnet/installer: dotnet/installer#17473 (comment)
@mthalman
Copy link
Member

mthalman commented Oct 9, 2023

It's picking up the rc1 version of Microsoft.Extensions.DependencyModel from the N-1 artifacts. This has the transitive dependency on the newer version of STJ than what arcade references. And because STJ wasn't listed as a dependency in arcade, the build never overrides arcade's STJ version dependency. So yes, the changes in dotnet/arcade#14093 should fix this. It will cause the build to override the preview4 version of STJ that arcade references and use the rc1 version from N-1 instead.

ViktorHofer added a commit to dotnet/arcade that referenced this pull request Oct 9, 2023
* Update Versions.Details.xml

Unblocks ingestion into dotnet/installer: dotnet/installer#17473 (comment)

* Update Version.Details.xml
@ViktorHofer
Copy link
Member

@mthalman any idea why the msbuild stable versioning change impacted this PR? Was it generally failing in all PRs or just in this one?

@mthalman
Copy link
Member

mthalman commented Oct 9, 2023

@mthalman any idea why the msbuild stable versioning change impacted this PR? Was it generally failing in all PRs or just in this one?

This is the only PR I'm aware of that introduced stable versioning for MSBuild into installer. This had impacted other repos where MSBuild stable versioning occurred.

@mthalman
Copy link
Member

mthalman commented Oct 9, 2023

Looks like there's another dependency that's messing things up: Microsoft.DotNet.SharedFramework.Sdk

@ViktorHofer
Copy link
Member

ViktorHofer commented Oct 9, 2023

This is the only PR I'm aware of that introduced stable versioning for MSBuild into installer. This had impacted other repos where MSBuild stable versioning occurred.

Oh I see. The MSBuild packages are updated as part of this change as coherency updates. Interesting.

Looks like there's another dependency that's messing things up: Microsoft.DotNet.SharedFramework.Sdk

Taking a look...

@ViktorHofer
Copy link
Member

ViktorHofer commented Oct 9, 2023

We are still missing the Versions.Details.xml change from arcade. Just need to wait a few more hours.

@mthalman
Copy link
Member

mthalman commented Oct 9, 2023

We are still missing the Versions.Details.xml change from arcade. Just need to wait a few more hours.

It should have the latest in 7cc75e6. I triggered the darc subscription to get that.

@ViktorHofer
Copy link
Member

No, the Arcade dependency points to dotnet/arcade@409c628 which isn't recent enough.

@mthalman
Copy link
Member

mthalman commented Oct 9, 2023

Latest build error:

/vmr/src/arcade/artifacts/source-build/self/src/src/Common/Microsoft.Arcade.Common/Microsoft.Arcade.Common.csproj(0,0): error NU1109: (NETCORE_ENGINEERING_TELEMETRY=Restore) Detected package downgrade: Microsoft.Bcl.AsyncInterfaces from 8.0.0-rc.1.23381.3 to centrally defined 8.0.0-preview.4.23259.5. Update the centrally managed package version to a higher version. 
 Microsoft.Arcade.Common -> System.Text.Json 8.0.0-rc.1.23381.3 -> Microsoft.Bcl.AsyncInterfaces (>= 8.0.0-rc.1.23381.3) 
 Microsoft.Arcade.Common -> Microsoft.Bcl.AsyncInterfaces (>= 8.0.0-preview.4.23259.5)

Fixing it in dotnet/arcade#14095

@ViktorHofer
Copy link
Member

ViktorHofer commented Oct 10, 2023

/vmr/artifacts/source-built-sdks/Microsoft.DotNet.Arcade.Sdk/tools/Pack.targets(12,5): error : <SymbolPackageFormat>snupkg</SymbolPackageFormat> is not supported by the Arcade SDK. [/vmr/src/sourcelink/artifacts/source-build/self/src/src/Microsoft.Build.StandardCI/Microsoft.Build.StandardCI.csproj]

This is the same error as in dotnet/sourcelink#1107. This is now showing up because of dotnet/arcade@f97854d. cc @mmitche @RussKie @tmat

Sourcelink enables snupkgs here: https://github.com/dotnet/sourcelink/blob/bd296362cb0b717a4fd0146a9790eadcd8e587a8/src/Directory.Build.props#L12

@RussKie
Copy link
Member

RussKie commented Oct 10, 2023

/vmr/artifacts/source-built-sdks/Microsoft.DotNet.Arcade.Sdk/tools/Pack.targets(12,5): error : <SymbolPackageFormat>snupkg</SymbolPackageFormat> is not supported by the Arcade SDK. [/vmr/src/sourcelink/artifacts/source-build/self/src/src/Microsoft.Build.StandardCI/Microsoft.Build.StandardCI.csproj]

This is the same error as in dotnet/sourcelink#1107. This is now showing up because of dotnet/arcade@f97854d. cc @mmitche Matt Mitchell (.NET) FTE @RussKie Igor Velikorossov FTE

Sourcelink enables snupkgs here: dotnet/sourcelink@bd29636/src/Directory.Build.props#L12

This can be suppressed with <SuppressSymbolPackageFormatValidation>true</SuppressSymbolPackageFormatValidation>

@ViktorHofer
Copy link
Member

Should it be suppressed?

@RussKie
Copy link
Member

RussKie commented Oct 10, 2023

I'm afraid I can't answer that question.

The reason this validation was added is that the Arcade SDK doesn't support snupkg and can only publish debug symbols as *.symbols.nupkg, which results in issue described in dotnet/extensions#4406.

@mmitche
Copy link
Member

mmitche commented Oct 10, 2023

@tmat re; The sourcelink issue. It looks like sourcelink switched to snupkg. Arcade doesn't support publishing symbols in that format currently. If that is fine, we should suppress the validation. If it's not then sourcelink should switch back.

@ViktorHofer
Copy link
Member

Blocked on #17187

…010.4

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk
 From Version 8.0.0-beta.23463.1 -> To Version 9.0.0-beta.23510.4

Dependency coherency updates

Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0,VS.Redist.Common.NetCore.TargetingPack.x64.9.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,Microsoft.DotNet.XliffTasks
 From Version 9.0.0-alpha.1.23456.3 -> To Version 9.0.0-alpha.1.23471.7 (parent: Microsoft.NET.Sdk
…010.4

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk
 From Version 8.0.0-beta.23463.1 -> To Version 9.0.0-beta.23510.4

Dependency coherency updates

Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0,VS.Redist.Common.NetCore.TargetingPack.x64.9.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,Microsoft.DotNet.XliffTasks
 From Version 9.0.0-alpha.1.23456.3 -> To Version 9.0.0-alpha.1.23471.7 (parent: Microsoft.NET.Sdk
…010.4

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk
 From Version 8.0.0-beta.23463.1 -> To Version 9.0.0-beta.23510.4

Dependency coherency updates

Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0,VS.Redist.Common.NetCore.TargetingPack.x64.9.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,Microsoft.DotNet.XliffTasks
 From Version 9.0.0-alpha.1.23456.3 -> To Version 9.0.0-alpha.1.23471.7 (parent: Microsoft.NET.Sdk
dotnet-maestro bot and others added 5 commits October 16, 2023 12:14
…010.4

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk
 From Version 8.0.0-beta.23463.1 -> To Version 9.0.0-beta.23510.4

Dependency coherency updates

Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0,VS.Redist.Common.NetCore.TargetingPack.x64.9.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,Microsoft.DotNet.XliffTasks
 From Version 9.0.0-alpha.1.23456.3 -> To Version 9.0.0-alpha.1.23471.7 (parent: Microsoft.NET.Sdk
…016.5

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk
 From Version 8.0.0-beta.23463.1 -> To Version 9.0.0-beta.23516.5

Dependency coherency updates

Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0,VS.Redist.Common.NetCore.TargetingPack.x64.9.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,Microsoft.DotNet.XliffTasks
 From Version 9.0.0-alpha.1.23456.3 -> To Version 9.0.0-alpha.1.23471.7 (parent: Microsoft.NET.Sdk
…017.7

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk
 From Version 8.0.0-beta.23463.1 -> To Version 9.0.0-beta.23517.7

Dependency coherency updates

Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0,VS.Redist.Common.NetCore.TargetingPack.x64.9.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,Microsoft.DotNet.XliffTasks
 From Version 9.0.0-alpha.1.23456.3 -> To Version 9.0.0-alpha.1.23471.7 (parent: Microsoft.NET.Sdk
…018.2

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk
 From Version 8.0.0-beta.23463.1 -> To Version 9.0.0-beta.23518.2

Dependency coherency updates

Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0,VS.Redist.Common.NetCore.TargetingPack.x64.9.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,Microsoft.DotNet.XliffTasks
 From Version 9.0.0-alpha.1.23456.3 -> To Version 9.0.0-alpha.1.23471.7 (parent: Microsoft.NET.Sdk
@ViktorHofer ViktorHofer merged commit c6cc3a7 into main Oct 19, 2023
19 of 20 checks passed
@ViktorHofer ViktorHofer deleted the darc-main-70fa24e6-a7d1-4df7-afe8-e790ad5c0989 branch October 19, 2023 20:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants