Skip to content

[main] Update dependencies from dotnet/windowsdesktop#41689

Merged
marcpopMSFT merged 6 commits intomainfrom
darc-main-aada8eb8-12cb-4624-bf31-1a28e3acf399
Jun 20, 2024
Merged

[main] Update dependencies from dotnet/windowsdesktop#41689
marcpopMSFT merged 6 commits intomainfrom
darc-main-aada8eb8-12cb-4624-bf31-1a28e3acf399

Conversation

@dotnet-maestro
Copy link
Contributor

@dotnet-maestro dotnet-maestro bot commented Jun 20, 2024 •
edited
Loading

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.NET.Sdk.WindowsDesktop: from 9.0.0-preview.7.24320.2 to 9.0.0-preview.7.24320.5 (parent: Microsoft.WindowsDesktop.App.Ref)
    • Microsoft.Dotnet.WinForms.ProjectTemplates: from 9.0.0-preview.6.24319.5 to 9.0.0-preview.6.24320.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
    • Microsoft.DotNet.Wpf.ProjectTemplates: from 9.0.0-preview.7.24320.2 to 9.0.0-preview.7.24320.5 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)

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

  • Subscription: 43b77b68-0b3c-49dd-3915-08d8e9750bf8
  • Build: 20240620.3
  • Date Produced: June 20, 2024 6:25:23 PM UTC
  • Commit: 16bd64088c359e88d8d17fe08bf135f43efdc5b6
  • Branch: refs/heads/main
@dotnet-maestro
Update dependencies from https://github.com/dotnet/windowsdesktop bui…
9951eb4 
…ld 20240620.1

Microsoft.WindowsDesktop.App.Ref , Microsoft.WindowsDesktop.App.Runtime.win-x64 , VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0 , VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0
 From Version 9.0.0-preview.6.24318.1 -> To Version 9.0.0-preview.6.24320.1

Dependency coherency updates

Microsoft.NET.Sdk.WindowsDesktop,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.DotNet.Wpf.ProjectTemplates
 From Version 9.0.0-preview.6.24317.1 -> To Version 9.0.0-preview.7.24320.2 (parent: Microsoft.WindowsDesktop.App.Ref
@ghost ghost added Area-CodeFlow untriaged Request triage from a team member labels Jun 20, 2024
@ViktorHofer ViktorHofer enabled auto-merge (squash) June 20, 2024 12:21
@dotnet-maestro
Copy link
Contributor Author

dotnet-maestro bot commented Jun 20, 2024

Notification for subscribed users from https://github.com/dotnet/windowsdesktop:

@dotnet/wpf-developers

Action requested: Please take a look at this failing automated dependency-flow pull request's checks; failures may be related to changes which originated in your repo.

  • This pull request contains changes from your source repo (https://github.com/dotnet/windowsdesktop) and seems to have failed checks in this PR. Please take a peek at the failures and comment if they seem relevant to your changes.
  • If you're being tagged in this comment it is due to an entry in the related Maestro Subscription of the Build Asset Registry. If you feel this entry has added your GitHub login or your GitHub team in error, please update the subscription to reflect this.
  • For more details, please read the Arcade Darc documentation
@kasperk81
Copy link
Contributor

kasperk81 commented Jun 20, 2024 

      Successfully created package 'D:\a\_work\1\vmr\src\windowsdesktop\artifacts\packages\Release\Shipping\Microsoft.Windows.Compatibility.9.0.0-preview.6.24320.1.symbols.nupkg'.
    D:\a\_work\1\vmr\artifacts\source-built-sdks\Microsoft.DotNet.SharedFramework.Sdk\targets\sharedfx.targets(409,5): error : Classification matches no files: System.Formats.Nrbf.dll [D:\a\_work\1\vmr\src\windowsdesktop\src\windowsdesktop\src\sfx\Microsoft.WindowsDesktop.App.Runtime.sfxproj]
##[error]artifacts\source-built-sdks\Microsoft.DotNet.SharedFramework.Sdk\targets\sharedfx.targets(409,5): error : (NETCORE_ENGINEERING_TELEMETRY=Build) Classification matches no files: System.Formats.Nrbf.dll
    D:\a\_work\1\vmr\artifacts\source-built-sdks\Microsoft.DotNet.SharedFramework.Sdk\targets\sharedfx.targets(409,5): error : Classification matches no files: System.IO.Hashing.dll [D:\a\_work\1\vmr\src\windowsdesktop\src\windowsdesktop\src\sfx\Microsoft.WindowsDesktop.App.Runtime.sfxproj]
##[error]artifacts\source-built-sdks\Microsoft.DotNet.SharedFramework.Sdk\targets\sharedfx.targets(409,5): error : (NETCORE_ENGINEERING_TELEMETRY=Build) Classification matches no files: System.IO.Hashing.dll
@ViktorHofer
Copy link
Member

ViktorHofer commented Jun 20, 2024

Funny. That means we need to merge the runtime and the windowsdesktop dependency flow together.
@ViktorHofer
Copy link
Member

ViktorHofer commented Jun 20, 2024

Things are now happening in #41616. Fingers crossed
auto-merge was automatically disabled June 20, 2024 16:48

Base branch was modified

dotnet-maestro bot and others added 3 commits June 20, 2024 18:01
@dotnet-maestro
Update dependencies from https://github.com/dotnet/windowsdesktop bui…
965e7d3 
…ld 20240620.2

Microsoft.WindowsDesktop.App.Ref , Microsoft.WindowsDesktop.App.Runtime.win-x64 , VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0 , VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0
 From Version 9.0.0-preview.6.24320.1 -> To Version 9.0.0-preview.6.24320.2

Dependency coherency updates

Microsoft.NET.Sdk.WindowsDesktop,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.DotNet.Wpf.ProjectTemplates
 From Version 9.0.0-preview.7.24320.2 -> To Version 9.0.0-preview.7.24320.5 (parent: Microsoft.WindowsDesktop.App.Ref
@ViktorHofer
Merge branch 'main' into darc-main-aada8eb8-12cb-4624-bf31-1a28e3acf399
4f17eca
@ViktorHofer
Delete src/SourceBuild/patches/roslyn/0002-versionsprops-and-details.…
03c3000 
…patch
@ViktorHofer ViktorHofer requested review from a team as code owners June 20, 2024 18:19
@ViktorHofer ViktorHofer enabled auto-merge (squash) June 20, 2024 18:20
@dotnet-maestro
Update dependencies from https://github.com/dotnet/windowsdesktop bui…
b2af98f 
…ld 20240620.5

Microsoft.WindowsDesktop.App.Ref , Microsoft.WindowsDesktop.App.Runtime.win-x64 , VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0 , VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0
 From Version 9.0.0-preview.6.24320.1 -> To Version 9.0.0-preview.7.24320.5

Dependency coherency updates

Microsoft.NET.Sdk.WindowsDesktop,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.DotNet.Wpf.ProjectTemplates
 From Version 9.0.0-preview.7.24320.2 -> To Version 9.0.0-preview.7.24320.5 (parent: Microsoft.WindowsDesktop.App.Ref
@kasperk81
Copy link
Contributor

kasperk81 commented Jun 20, 2024

the last commit was rushed. they switched to p7 when p6 build was few minutes away from completion and merged.
@kasperk81
Copy link
Contributor

kasperk81 commented Jun 20, 2024

revert the last commit and merge?
@ViktorHofer
Copy link
Member

ViktorHofer commented Jun 20, 2024 •
edited
Loading

It's fine to already consume the P7 versioned packages here in main. We will soon branch sdk off for P6 and will trigger a new dependency flow internally anyway. That will then overwrite the package versions back to P6.

Merging the PR in now sounds good.
@dotnet-maestro
Update dependencies from https://github.com/dotnet/windowsdesktop bui…
c4571f6 
…ld 20240620.3

Microsoft.WindowsDesktop.App.Ref , Microsoft.WindowsDesktop.App.Runtime.win-x64 , VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0 , VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0
 From Version 9.0.0-preview.6.24320.1 -> To Version 9.0.0-preview.6.24320.3

Dependency coherency updates

Microsoft.NET.Sdk.WindowsDesktop,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.DotNet.Wpf.ProjectTemplates
 From Version 9.0.0-preview.7.24320.2 -> To Version 9.0.0-preview.7.24320.5 (parent: Microsoft.WindowsDesktop.App.Ref
@marcpopMSFT marcpopMSFT disabled auto-merge June 20, 2024 20:03
@marcpopMSFT marcpopMSFT merged commit 7822425 into main Jun 20, 2024
@marcpopMSFT marcpopMSFT deleted the darc-main-aada8eb8-12cb-4624-bf31-1a28e3acf399 branch June 20, 2024 20:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Area-CodeFlow untriaged Request triage from a team member

4 participants

@kasperk81 @ViktorHofer @akoeplinger @marcpopMSFT