[master] Update dependencies from dotnet/sdk#7943
Conversation
Auto-Merge StatusThis pull request has not been merged because Maestro++ is waiting on the following merge policies.
|
|
@swaroop-sridhar @jeffschwMSFT I'm seeing a test failure in It_generates_a_single_file_for_self_contained_apps (currently on Mac, the other legs are still running):
Have we recently updated the single file support so that this file is now bundled, and hence the test needs to be updated? |
Auto-Merge StatusThis pull request has not been merged because Maestro++ is waiting on the following merge policies.
|
Auto-Merge StatusThis pull request has not been merged because Maestro++ is waiting on the following merge policies.
|
|
@VSadov @agocke @mateoatr any update on this issue? This is blocking dotnet/sdk#11499 |
Auto-Merge StatusThis pull request has not been merged because Maestro++ is waiting on the following merge policies.
|
|
Yes |
|
This also applies to |
Auto-Merge StatusThis pull request has not been merged because Maestro++ is waiting on the following merge policies.
|
|
@dsplaisted - is there a list of files expected by the test that should have coreclr removed? I know one such list in Are there more? |
Auto-Merge StatusThis pull request has not been merged because Maestro++ is waiting on the following merge policies.
|
|
Do you mind add this test to skip list https://github.com/dotnet/installer/blob/master/test/SdkTests/TestConfig.xml so we can unblock the PR? dotnet/installer and dotnet/sdk share many tests. Also note, this specific test is owned by runtime team. |
Auto-Merge StatusThis pull request has not been merged because Maestro++ is waiting on the following merge policies.
|
|
Yes, since this is an understood change, skipping would be a better option. |
Auto-Merge StatusThis pull request has not been merged because Maestro++ is waiting on the following merge policies.
|
|
The PR to disabe the test: #7950 |
Auto-Merge StatusThis pull request has been merged because the following merge policies have succeeded.
|
Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 5.0.100-preview.8.20351.3 -> To Version 5.0.100-preview.8.20356.9 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,Microsoft.WindowsDesktop.App,Microsoft.NETCore.App.Ref,Microsoft.NETCore.App.Internal,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0,dotnet-dev-certs,dotnet-user-secrets,dotnet-watch,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 5.0.0-preview.8.20330.4 -> To Version 5.0.0-preview.8.20352.5 (parent: Microsoft.NET.Sdk
Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 5.0.100-preview.8.20351.3 -> To Version 5.0.100-preview.8.20356.10 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,Microsoft.WindowsDesktop.App,Microsoft.NETCore.App.Ref,Microsoft.NETCore.App.Internal,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0,dotnet-dev-certs,dotnet-user-secrets,dotnet-watch,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 5.0.0-preview.8.20330.4 -> To Version 5.0.0-preview.8.20352.5 (parent: Microsoft.NET.Sdk
Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 5.0.100-preview.8.20351.3 -> To Version 5.0.100-preview.8.20356.11 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,Microsoft.WindowsDesktop.App,Microsoft.NETCore.App.Ref,Microsoft.NETCore.App.Internal,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0,dotnet-dev-certs,dotnet-user-secrets,dotnet-watch,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 5.0.0-preview.8.20330.4 -> To Version 5.0.0-preview.8.20352.5 (parent: Microsoft.NET.Sdk
Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 5.0.100-preview.8.20351.3 -> To Version 5.0.100-preview.8.20356.13 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,Microsoft.WindowsDesktop.App,Microsoft.NETCore.App.Ref,Microsoft.NETCore.App.Internal,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0,dotnet-dev-certs,dotnet-user-secrets,dotnet-watch,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 5.0.0-preview.8.20330.4 -> To Version 5.0.0-preview.8.20352.5 (parent: Microsoft.NET.Sdk
Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 5.0.100-preview.8.20351.3 -> To Version 5.0.100-preview.8.20357.2 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,Microsoft.WindowsDesktop.App,Microsoft.NETCore.App.Ref,Microsoft.NETCore.App.Internal,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0,dotnet-dev-certs,dotnet-user-secrets,dotnet-watch,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 5.0.0-preview.8.20330.4 -> To Version 5.0.0-preview.8.20352.5 (parent: Microsoft.NET.Sdk
Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 5.0.100-preview.8.20351.3 -> To Version 5.0.100-preview.8.20357.3 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,Microsoft.WindowsDesktop.App,Microsoft.NETCore.App.Ref,Microsoft.NETCore.App.Internal,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0,dotnet-dev-certs,dotnet-user-secrets,dotnet-watch,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 5.0.0-preview.8.20330.4 -> To Version 5.0.0-preview.8.20352.5 (parent: Microsoft.NET.Sdk
Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 5.0.100-preview.8.20351.3 -> To Version 5.0.100-preview.8.20357.5 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,Microsoft.WindowsDesktop.App,Microsoft.NETCore.App.Ref,Microsoft.NETCore.App.Internal,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0,dotnet-dev-certs,dotnet-user-secrets,dotnet-watch,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 5.0.0-preview.8.20330.4 -> To Version 5.0.0-preview.8.20352.5 (parent: Microsoft.NET.Sdk
Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 5.0.100-preview.8.20351.3 -> To Version 5.0.100-preview.8.20357.6 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,Microsoft.WindowsDesktop.App,Microsoft.NETCore.App.Ref,Microsoft.NETCore.App.Internal,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0,dotnet-dev-certs,dotnet-user-secrets,dotnet-watch,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 5.0.0-preview.8.20330.4 -> To Version 5.0.0-preview.8.20352.5 (parent: Microsoft.NET.Sdk
Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 5.0.100-preview.8.20351.3 -> To Version 5.0.100-preview.8.20358.1 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,Microsoft.WindowsDesktop.App,Microsoft.NETCore.App.Ref,Microsoft.NETCore.App.Internal,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0,dotnet-dev-certs,dotnet-user-secrets,dotnet-watch,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 5.0.0-preview.8.20330.4 -> To Version 5.0.0-preview.8.20352.5 (parent: Microsoft.NET.Sdk
Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 5.0.100-preview.8.20351.3 -> To Version 5.0.100-preview.8.20358.2 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,Microsoft.WindowsDesktop.App,Microsoft.NETCore.App.Ref,Microsoft.NETCore.App.Internal,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0,dotnet-dev-certs,dotnet-user-secrets,dotnet-watch,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 5.0.0-preview.8.20330.4 -> To Version 5.0.0-preview.8.20352.5 (parent: Microsoft.NET.Sdk
Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 5.0.100-preview.8.20351.3 -> To Version 5.0.100-preview.8.20358.3 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,Microsoft.WindowsDesktop.App,Microsoft.NETCore.App.Ref,Microsoft.NETCore.App.Internal,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0,dotnet-dev-certs,dotnet-user-secrets,dotnet-watch,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 5.0.0-preview.8.20330.4 -> To Version 5.0.0-preview.8.20352.5 (parent: Microsoft.NET.Sdk
Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 5.0.100-preview.8.20351.3 -> To Version 5.0.100-preview.8.20358.4 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,Microsoft.WindowsDesktop.App,Microsoft.NETCore.App.Ref,Microsoft.NETCore.App.Internal,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0,dotnet-dev-certs,dotnet-user-secrets,dotnet-watch,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 5.0.0-preview.8.20330.4 -> To Version 5.0.0-preview.8.20352.5 (parent: Microsoft.NET.Sdk
Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 5.0.100-preview.8.20351.3 -> To Version 5.0.100-preview.8.20358.6 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,Microsoft.WindowsDesktop.App,Microsoft.NETCore.App.Ref,Microsoft.NETCore.App.Internal,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0,dotnet-dev-certs,dotnet-user-secrets,dotnet-watch,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 5.0.0-preview.8.20330.4 -> To Version 5.0.0-preview.8.20352.5 (parent: Microsoft.NET.Sdk
27a2cad to
a5adc11
Compare
* Generate target platform assembly attributes * Update stage 0 * Address code review * Add condition on net5.0 * Change expect files per dotnet/installer#7943 (comment)
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
From https://github.com/dotnet/sdk