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

[release/6.0-rc1] Update dependencies from dotnet/winforms #5208

Conversation

dotnet-maestro[bot]
Copy link
Contributor

@dotnet-maestro dotnet-maestro bot commented Aug 28, 2021

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:
    • System.CodeDom: from 6.0.0-rc.1.21426.17 to 6.0.0-rc.1.21430.11 (parent: Microsoft.Private.Winforms)
    • System.Configuration.ConfigurationManager: from 6.0.0-rc.1.21426.17 to 6.0.0-rc.1.21430.11 (parent: Microsoft.Private.Winforms)
    • System.Diagnostics.EventLog: from 6.0.0-rc.1.21426.17 to 6.0.0-rc.1.21430.11 (parent: Microsoft.Private.Winforms)
    • System.DirectoryServices: from 6.0.0-rc.1.21426.17 to 6.0.0-rc.1.21430.11 (parent: Microsoft.Private.Winforms)
    • System.Drawing.Common: from 6.0.0-rc.1.21426.17 to 6.0.0-rc.1.21430.11 (parent: Microsoft.Private.Winforms)
    • System.Reflection.MetadataLoadContext: from 6.0.0-rc.1.21426.17 to 6.0.0-rc.1.21430.11 (parent: Microsoft.Private.Winforms)
    • System.Security.Cryptography.Xml: from 6.0.0-rc.1.21426.17 to 6.0.0-rc.1.21430.11 (parent: Microsoft.Private.Winforms)
    • System.Security.Permissions: from 6.0.0-rc.1.21426.17 to 6.0.0-rc.1.21430.11 (parent: Microsoft.Private.Winforms)
    • System.Windows.Extensions: from 6.0.0-rc.1.21426.17 to 6.0.0-rc.1.21430.11 (parent: Microsoft.Private.Winforms)
    • Microsoft.NETCore.Platforms: from 6.0.0-rc.1.21426.17 to 6.0.0-rc.1.21430.11 (parent: Microsoft.Private.Winforms)
    • System.IO.Packaging: from 6.0.0-rc.1.21426.17 to 6.0.0-rc.1.21430.11 (parent: Microsoft.Private.Winforms)
    • Microsoft.NETCore.ILDAsm: from 6.0.0-rc.1.21426.17 to 6.0.0-rc.1.21430.11 (parent: Microsoft.Private.Winforms)
    • Microsoft.NETCore.ILAsm: from 6.0.0-rc.1.21426.17 to 6.0.0-rc.1.21430.11 (parent: Microsoft.Private.Winforms)
    • System.Resources.Extensions: from 6.0.0-rc.1.21426.17 to 6.0.0-rc.1.21430.11 (parent: Microsoft.Private.Winforms)
    • Microsoft.NETCore.App.Ref: from 6.0.0-rc.1.21426.17 to 6.0.0-rc.1.21430.11 (parent: Microsoft.Private.Winforms)
    • Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0-rc.1.21426.17 to 6.0.0-rc.1.21430.11 (parent: Microsoft.Private.Winforms)
    • VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.0-rc.1.21426.17 to 6.0.0-rc.1.21430.11 (parent: Microsoft.Private.Winforms)

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

  • Subscription: ccecb758-30c2-4b74-af81-08d961c59698
  • Build: 20210830.13
  • Date Produced: 8/30/2021 6:57 PM
  • Commit: bab479fa2de8644d36533ef8c35022ff4d6e0c13
  • Branch: refs/heads/release/6.0-rc1

…10827.24

Microsoft.Dotnet.WinForms.ProjectTemplates , Microsoft.Private.Winforms
 From Version 6.0.0-rc.1.21426.8 -> To Version 6.0.0-rc.1.21427.24

Dependency coherency updates

System.CodeDom,System.Configuration.ConfigurationManager,System.Diagnostics.EventLog,System.DirectoryServices,System.Drawing.Common,System.Reflection.MetadataLoadContext,System.Security.Cryptography.Xml,System.Security.Permissions,System.Windows.Extensions,Microsoft.NETCore.Platforms,System.IO.Packaging,Microsoft.NETCore.ILDAsm,Microsoft.NETCore.ILAsm,System.Resources.Extensions,Microsoft.NETCore.App.Ref,Microsoft.NETCore.App.Runtime.win-x64,VS.Redist.Common.NetCore.SharedFramework.x64.6.0
 From Version 6.0.0-rc.1.21426.17 -> To Version 6.0.0-rc.1.21427.30 (parent: Microsoft.Private.Winforms
@dotnet-maestro dotnet-maestro bot requested a review from a team as a code owner August 28, 2021 03:40
@ghost ghost added the PR metadata: Label to tag PRs, to facilitate with triage label Aug 28, 2021
@ghost ghost requested review from fabiant3, ryalanms and SamBent August 28, 2021 03:40
…10830.5

Microsoft.Dotnet.WinForms.ProjectTemplates , Microsoft.Private.Winforms
 From Version 6.0.0-rc.1.21426.8 -> To Version 6.0.0-rc.1.21430.5

Dependency coherency updates

System.CodeDom,System.Configuration.ConfigurationManager,System.Diagnostics.EventLog,System.DirectoryServices,System.Drawing.Common,System.Reflection.MetadataLoadContext,System.Security.Cryptography.Xml,System.Security.Permissions,System.Windows.Extensions,Microsoft.NETCore.Platforms,System.IO.Packaging,Microsoft.NETCore.ILDAsm,Microsoft.NETCore.ILAsm,System.Resources.Extensions,Microsoft.NETCore.App.Ref,Microsoft.NETCore.App.Runtime.win-x64,VS.Redist.Common.NetCore.SharedFramework.x64.6.0
 From Version 6.0.0-rc.1.21426.17 -> To Version 6.0.0-rc.1.21430.1 (parent: Microsoft.Private.Winforms
…10830.7

Microsoft.Dotnet.WinForms.ProjectTemplates , Microsoft.Private.Winforms
 From Version 6.0.0-rc.1.21426.8 -> To Version 6.0.0-rc.1.21430.7

Dependency coherency updates

System.CodeDom,System.Configuration.ConfigurationManager,System.Diagnostics.EventLog,System.DirectoryServices,System.Drawing.Common,System.Reflection.MetadataLoadContext,System.Security.Cryptography.Xml,System.Security.Permissions,System.Windows.Extensions,Microsoft.NETCore.Platforms,System.IO.Packaging,Microsoft.NETCore.ILDAsm,Microsoft.NETCore.ILAsm,System.Resources.Extensions,Microsoft.NETCore.App.Ref,Microsoft.NETCore.App.Runtime.win-x64,VS.Redist.Common.NetCore.SharedFramework.x64.6.0
 From Version 6.0.0-rc.1.21426.17 -> To Version 6.0.0-rc.1.21430.5 (parent: Microsoft.Private.Winforms
@mmitche
Copy link
Member

mmitche commented Aug 30, 2021

@ryalanms This looks a bit interesting.

…10830.13

Microsoft.Dotnet.WinForms.ProjectTemplates , Microsoft.Private.Winforms
 From Version 6.0.0-rc.1.21426.8 -> To Version 6.0.0-rc.1.21430.13

Dependency coherency updates

System.CodeDom,System.Configuration.ConfigurationManager,System.Diagnostics.EventLog,System.DirectoryServices,System.Drawing.Common,System.Reflection.MetadataLoadContext,System.Security.Cryptography.Xml,System.Security.Permissions,System.Windows.Extensions,Microsoft.NETCore.Platforms,System.IO.Packaging,Microsoft.NETCore.ILDAsm,Microsoft.NETCore.ILAsm,System.Resources.Extensions,Microsoft.NETCore.App.Ref,Microsoft.NETCore.App.Runtime.win-x64,VS.Redist.Common.NetCore.SharedFramework.x64.6.0
 From Version 6.0.0-rc.1.21426.17 -> To Version 6.0.0-rc.1.21430.11 (parent: Microsoft.Private.Winforms
@mmitche
Copy link
Member

mmitche commented Aug 30, 2021

@ericstj @eerhardt This failure looks pretty interesting, can you take a peek?

@eerhardt
Copy link
Member

This is due to my change dotnet/runtime#58278 to support incremental Roslyn source generators. To fix it, we need to use VS 2022. Using VS 2019 uses the old Roslyn version, which gives this error.

@ericstj
Copy link
Member

ericstj commented Aug 30, 2021

We can just remove the analyzers to unblock this build, do a new version of 1400177. I suspect that it's harder to update compiler here (though not certain) since I think WPF builds using desktop MSBuild which requires VS installed on the build agents.

@ryalanms
Copy link
Member

I see here that there is now a 2022 build queue: https://github.com/dotnet/core-eng/wiki/VS2022-Upgrade-Schedule.

Should WPF move to this queue now?

BuildPool.Windows.Amd64.VS2022.Pre.Open

These require VS 2022 Roslyn v4.0, but the CI machine is still using VS 2019.
https://github.com/dotnet/wpf/issues/5224 -->
<Target Name="_RemoveFrameworkReferenceAnalyzers" AfterTargets="ResolveTargetingPackAssets">
<ItemGroup>
<Analyzer Remove="@(Analyzer)" Condition="'%(Analyzer.FrameworkReferenceName)' != '' and $([System.String]::Copy('%(Directory)').IndexOf('analyzers', StringComparison.OrdinalIgnoreCase)) > 0" />
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
<Analyzer Remove="@(Analyzer)" Condition="'%(Analyzer.FrameworkReferenceName)' != '' and $([System.String]::Copy('%(Directory)').IndexOf('analyzers', StringComparison.OrdinalIgnoreCase)) > 0" />
<Analyzer Remove="@(Analyzer)" Condition="'%(Analyzer.FrameworkReferenceName)' != ''" />

You can remove the later part of this condition. That was present when I needed to distingush analyzers from refs (WPF was previously using an SDK which raised them as references).

Copy link
Member

Choose a reason for hiding this comment

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

Waiting for CI to validate the current changes and then will commit this suggestion.

Copy link
Member

Choose a reason for hiding this comment

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

Or not, I guess

@dotnet-maestro dotnet-maestro bot merged commit 8fa13be into release/6.0-rc1 Aug 30, 2021
@dotnet-maestro dotnet-maestro bot deleted the darc-release/6.0-rc1-e267fd0a-f5d0-47b6-81a0-612dfa37f09e branch August 30, 2021 20:37
eerhardt added a commit that referenced this pull request Aug 30, 2021
@eerhardt eerhardt mentioned this pull request Aug 30, 2021
mmitche pushed a commit that referenced this pull request Aug 30, 2021
@mmitche
Copy link
Member

mmitche commented Aug 31, 2021

@ryalanms We will need to move to the vs2022 queue eventually I think, or alter the repo logic at https://github.com/dotnet/wpf/blob/main/eng/WpfArcadeSdk/Sdk/Sdk.props#L18. When we flip to RTM, the VS2019 queue won't be able to supply langversion:10. I am not sure whether it's right to keep it at preview for the rtm build.

/cc @MattGal if you have any thoughts on this.

@MattGal
Copy link
Member

MattGal commented Aug 31, 2021

/cc @MattGal if you have any thoughts on this.

Just two primarily:

  • Right now, due to the activation issues, we only have .Open VS 2022 machines in dnceng/public. If we need official build machines, we should create an issue to handle this on the dotnet/core-eng repo.
  • We should probably use a VS 2022 buildtools SKU to prevent time-bombing since this is purely for build.

If we're certain we need the internal build agents, let me know and I'll get an FR issue on the board.

@mmitche
Copy link
Member

mmitche commented Aug 31, 2021

@MattGal I'll leave the WPF folks to comment on whether it's required. If langversion 10 is required (and we can't use preview to get it for the rtm build), then we'll need internal build queues.

My hunch, though, is that we could keep it preview for the rtm build and flip to 10 after dev17 ships.

@ryalanms
Copy link
Member

ryalanms commented Sep 3, 2021

@eerhardt: I believe we need this change in release/6.0 and main as well: 280cdc6.

eerhardt added a commit that referenced this pull request Sep 3, 2021
eerhardt added a commit that referenced this pull request Sep 3, 2021
@eerhardt
Copy link
Member

eerhardt commented Sep 3, 2021

@ryalanms - I've updated both:

dotnet-maestro bot added a commit that referenced this pull request Sep 3, 2021
[release/6.0] Update dependencies from dotnet/winforms
- Coherency Updates:
  - System.CodeDom: from 6.0.0-rc.2.21429.8 to 6.0.0-rc.2.21453.6 (parent: Microsoft.Private.Winforms)
  - System.Configuration.ConfigurationManager: from 6.0.0-rc.2.21429.8 to 6.0.0-rc.2.21453.6 (parent: Microsoft.Private.Winforms)
  - System.Diagnostics.EventLog: from 6.0.0-rc.2.21429.8 to 6.0.0-rc.2.21453.6 (parent: Microsoft.Private.Winforms)
  - System.DirectoryServices: from 6.0.0-rc.2.21429.8 to 6.0.0-rc.2.21453.6 (parent: Microsoft.Private.Winforms)
  - System.Drawing.Common: from 6.0.0-rc.2.21429.8 to 6.0.0-rc.2.21453.6 (parent: Microsoft.Private.Winforms)
  - System.Reflection.MetadataLoadContext: from 6.0.0-rc.2.21429.8 to 6.0.0-rc.2.21453.6 (parent: Microsoft.Private.Winforms)
  - System.Security.Cryptography.Xml: from 6.0.0-rc.2.21429.8 to 6.0.0-rc.2.21453.6 (parent: Microsoft.Private.Winforms)
  - System.Security.Permissions: from 6.0.0-rc.2.21429.8 to 6.0.0-rc.2.21453.6 (parent: Microsoft.Private.Winforms)
  - System.Windows.Extensions: from 6.0.0-rc.2.21429.8 to 6.0.0-rc.2.21453.6 (parent: Microsoft.Private.Winforms)
  - Microsoft.NETCore.Platforms: from 6.0.0-rc.2.21429.8 to 6.0.0-rc.2.21453.6 (parent: Microsoft.Private.Winforms)
  - System.IO.Packaging: from 6.0.0-rc.2.21429.8 to 6.0.0-rc.2.21453.6 (parent: Microsoft.Private.Winforms)
  - Microsoft.NETCore.ILDAsm: from 6.0.0-rc.2.21429.8 to 6.0.0-rc.2.21453.6 (parent: Microsoft.Private.Winforms)
  - Microsoft.NETCore.ILAsm: from 6.0.0-rc.2.21429.8 to 6.0.0-rc.2.21453.6 (parent: Microsoft.Private.Winforms)
  - System.Resources.Extensions: from 6.0.0-rc.2.21429.8 to 6.0.0-rc.2.21453.6 (parent: Microsoft.Private.Winforms)
  - Microsoft.NETCore.App.Ref: from 6.0.0-rc.2.21429.8 to 6.0.0-rc.2.21453.6 (parent: Microsoft.Private.Winforms)
  - Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0-rc.2.21429.8 to 6.0.0-rc.2.21453.6 (parent: Microsoft.Private.Winforms)
  - VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.0-rc.2.21429.8 to 6.0.0-rc.2.21453.6 (parent: Microsoft.Private.Winforms)

 - Remove Analyzers coming from net6.0 ref pack

These require VS 2022 Roslyn v4.0, but the CI machine is still using VS 2019.

 - Respond to PR feedback from #5208 (#5225)
@ryalanms
Copy link
Member

ryalanms commented Sep 3, 2021

Thank you!

dotnet-maestro bot added a commit that referenced this pull request Sep 3, 2021
[main] Update dependencies from dotnet/winforms
- Coherency Updates:
  - System.CodeDom: from 7.0.0-alpha.1.21427.1 to 7.0.0-alpha.1.21453.1 (parent: Microsoft.Private.Winforms)
  - System.Configuration.ConfigurationManager: from 7.0.0-alpha.1.21427.1 to 7.0.0-alpha.1.21453.1 (parent: Microsoft.Private.Winforms)
  - System.Diagnostics.EventLog: from 7.0.0-alpha.1.21427.1 to 7.0.0-alpha.1.21453.1 (parent: Microsoft.Private.Winforms)
  - System.DirectoryServices: from 7.0.0-alpha.1.21427.1 to 7.0.0-alpha.1.21453.1 (parent: Microsoft.Private.Winforms)
  - System.Drawing.Common: from 7.0.0-alpha.1.21427.1 to 7.0.0-alpha.1.21453.1 (parent: Microsoft.Private.Winforms)
  - System.Reflection.MetadataLoadContext: from 7.0.0-alpha.1.21427.1 to 7.0.0-alpha.1.21453.1 (parent: Microsoft.Private.Winforms)
  - System.Security.Cryptography.Xml: from 7.0.0-alpha.1.21427.1 to 7.0.0-alpha.1.21453.1 (parent: Microsoft.Private.Winforms)
  - System.Security.Permissions: from 7.0.0-alpha.1.21427.1 to 7.0.0-alpha.1.21453.1 (parent: Microsoft.Private.Winforms)
  - System.Windows.Extensions: from 7.0.0-alpha.1.21427.1 to 7.0.0-alpha.1.21453.1 (parent: Microsoft.Private.Winforms)
  - Microsoft.NETCore.Platforms: from 7.0.0-alpha.1.21427.1 to 7.0.0-alpha.1.21453.1 (parent: Microsoft.Private.Winforms)
  - System.IO.Packaging: from 7.0.0-alpha.1.21427.1 to 7.0.0-alpha.1.21453.1 (parent: Microsoft.Private.Winforms)
  - Microsoft.NETCore.ILDAsm: from 7.0.0-alpha.1.21427.1 to 7.0.0-alpha.1.21453.1 (parent: Microsoft.Private.Winforms)
  - Microsoft.NETCore.ILAsm: from 7.0.0-alpha.1.21427.1 to 7.0.0-alpha.1.21453.1 (parent: Microsoft.Private.Winforms)
  - System.Resources.Extensions: from 7.0.0-alpha.1.21427.1 to 7.0.0-alpha.1.21453.1 (parent: Microsoft.Private.Winforms)
  - Microsoft.NETCore.App.Ref: from 7.0.0-alpha.1.21427.1 to 7.0.0-alpha.1.21453.1 (parent: Microsoft.Private.Winforms)
  - Microsoft.NETCore.App.Runtime.win-x64: from 7.0.0-alpha.1.21427.1 to 7.0.0-alpha.1.21453.1 (parent: Microsoft.Private.Winforms)
  - VS.Redist.Common.NetCore.SharedFramework.x64.7.0: from 7.0.0-alpha.1.21427.1 to 7.0.0-alpha.1.21453.1 (parent: Microsoft.Private.Winforms)

 - Merge branch 'main' into darc-main-6135067d-e034-47ce-af6b-28e16f5b1dd6

 - Remove Analyzers coming from net6.0 ref pack

These require VS 2022 Roslyn v4.0, but the CI machine is still using VS 2019.

 - Respond to PR feedback from #5208 (#5225)
@ghost ghost locked as resolved and limited conversation to collaborators Apr 7, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
PR metadata: Label to tag PRs, to facilitate with triage
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants