Skip to content

[main] Update dependencies from dotnet/sdk #18752

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 10 commits into from
Feb 23, 2024
Merged

[main] Update dependencies from dotnet/sdk #18752

merged 10 commits into from
Feb 23, 2024

Conversation

@dotnet-maestro
Copy link

@dotnet-maestro dotnet-maestro bot commented Feb 22, 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.WindowsDesktop.App.Ref: from 9.0.0-preview.2.24120.1 to 9.0.0-preview.2.24122.1 (parent: Microsoft.NET.Sdk)
    • VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0: from 9.0.0-preview.2.24120.1 to 9.0.0-preview.2.24122.1 (parent: Microsoft.NET.Sdk)
    • VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0: from 9.0.0-preview.2.24120.1 to 9.0.0-preview.2.24122.1 (parent: Microsoft.NET.Sdk)
    • VS.Redist.Common.NetCore.SharedFramework.x64.9.0: from 9.0.0-preview.2.24120.11 to 9.0.0-preview.2.24122.4 (parent: Microsoft.NET.Sdk)
    • Microsoft.NETCore.App.Ref: from 9.0.0-preview.2.24120.11 to 9.0.0-preview.2.24122.4 (parent: Microsoft.NET.Sdk)
    • VS.Redist.Common.NetCore.TargetingPack.x64.9.0: from 9.0.0-preview.2.24120.11 to 9.0.0-preview.2.24122.4 (parent: Microsoft.NET.Sdk)
    • Microsoft.NETCore.App.Host.win-x64: from 9.0.0-preview.2.24120.11 to 9.0.0-preview.2.24122.4 (parent: Microsoft.NET.Sdk)
    • Microsoft.NETCore.Platforms: from 9.0.0-preview.2.24120.11 to 9.0.0-preview.2.24122.4 (parent: Microsoft.NET.Sdk)
    • Microsoft.SourceBuild.Intermediate.runtime.linux-x64: from 9.0.0-preview.2.24120.11 to 9.0.0-preview.2.24122.4 (parent: Microsoft.NET.Sdk)
    • Microsoft.WindowsDesktop.App.Runtime.win-x64: from 9.0.0-preview.2.24120.1 to 9.0.0-preview.2.24122.1 (parent: Microsoft.NET.Sdk)
    • Microsoft.Dotnet.WinForms.ProjectTemplates: from 9.0.0-preview.2.24118.1 to 9.0.0-preview.2.24122.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
    • Microsoft.WindowsDesktop.App.Runtime.win-x64: from 9.0.0-preview.2.24120.1 to 9.0.0-preview.2.24122.1 (parent: Microsoft.NET.Sdk)
    • Microsoft.DotNet.Wpf.ProjectTemplates: from 9.0.0-preview.2.24119.1 to 9.0.0-preview.2.24122.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
    • Microsoft.FSharp.Compiler: from 12.8.300-beta.24120.1 to 12.8.300-beta.24122.3 (parent: Microsoft.NET.Sdk)
    • Microsoft.SourceBuild.Intermediate.fsharp: from 8.0.300-beta.24120.1 to 8.0.300-beta.24122.3 (parent: Microsoft.NET.Sdk)
    • Microsoft.NET.Test.Sdk: from 17.10.0-preview-24119-01 to 17.10.0-preview-24120-01 (parent: Microsoft.NET.Sdk)
    • Microsoft.SourceBuild.Intermediate.vstest: from 17.10.0-preview-24119-01 to 17.10.0-preview-24120-01 (parent: Microsoft.NET.Sdk)
    • Microsoft.NET.ILLink.Tasks: from 9.0.0-preview.2.24120.11 to 9.0.0-preview.2.24122.4 (parent: Microsoft.NET.Sdk)
    • Microsoft.Net.Compilers.Toolset: from 4.10.0-2.24120.7 to 4.10.0-2.24122.3 (parent: Microsoft.NET.Sdk)
    • Microsoft.SourceBuild.Intermediate.roslyn: from 4.10.0-2.24120.7 to 4.10.0-2.24122.3 (parent: Microsoft.NET.Sdk)
    • Microsoft.Build: from 17.10.0-preview-24120-06 to 17.10.0-preview-24122-01 (parent: Microsoft.NET.Sdk)
    • Microsoft.SourceBuild.Intermediate.msbuild: from 17.10.0-preview-24120-06 to 17.10.0-preview-24122-01 (parent: Microsoft.NET.Sdk)
    • NuGet.Build.Tasks: from 6.10.0-preview.2.32 to 6.10.0-preview.2.41 (parent: Microsoft.NET.Sdk)
    • Microsoft.NETCore.App.Runtime.win-x64: from 9.0.0-preview.2.24120.11 to 9.0.0-preview.2.24122.4 (parent: Microsoft.NET.Sdk)
    • Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport: from 9.0.0-preview.2.24114.5 to 9.0.0-preview.2.24121.1 (parent: Microsoft.NETCore.App.Runtime.win-x64)
    • Microsoft.NETCore.App.Runtime.win-x64: from 9.0.0-preview.2.24120.11 to 9.0.0-preview.2.24122.4 (parent: Microsoft.NET.Sdk)
    • Microsoft.SourceBuild.Intermediate.emsdk: from 9.0.0-preview.2.24114.5 to 9.0.0-preview.2.24121.1 (parent: Microsoft.NETCore.App.Runtime.win-x64)

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

  • Subscription: f8ee08b0-6c3d-485a-6895-08db0a1df366
  • Build: 20240223.1
  • Date Produced: February 23, 2024 11:23:00 AM UTC
  • Commit: 3075c3bc8d8aa4e0ffcf2945459ef2ee383e3ae0
  • Branch: refs/heads/main

dotnet-maestro bot and others added 2 commits February 22, 2024 20:59
@dotnet-maestro
Update dependencies from https://github.com/dotnet/sdk build 20240222.5
68472a4 
Microsoft.SourceBuild.Intermediate.sdk , Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 9.0.100-preview.2.24122.2 -> To Version 9.0.100-preview.2.24122.5

Dependency coherency updates

Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset,Microsoft.SourceBuild.Intermediate.roslyn,Microsoft.Build,Microsoft.SourceBuild.Intermediate.msbuild
 From Version 9.0.0-preview.2.24120.1 -> To Version 9.0.0-preview.2.24121.1 (parent: Microsoft.NET.Sdk
@mthalman
Rebase fsharp patch
1a89a3e
@dotnet-maestro dotnet-maestro bot requested a review from a team as a code owner February 22, 2024 21:47
@dotnet-maestro
Update dependencies from https://github.com/dotnet/sdk build 20240222.7
4dee2c3 
Microsoft.SourceBuild.Intermediate.sdk , Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 9.0.100-preview.2.24122.2 -> To Version 9.0.100-preview.2.24122.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.SharedFramework.x64.9.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.9.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.Platforms,Microsoft.SourceBuild.Intermediate.runtime.linux-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.SourceBuild.Intermediate.roslyn,Microsoft.Build,Microsoft.SourceBuild.Intermediate.msbuild,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.SourceBuild.Intermediate.emsdk
 From Version 9.0.0-preview.2.24120.1 -> To Version 9.0.0-preview.2.24121.1 (parent: Microsoft.NET.Sdk
@dotnet-maestro
Update dependencies from https://github.com/dotnet/sdk build 20240222.8
44e0beb 
Microsoft.SourceBuild.Intermediate.sdk , Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 9.0.100-preview.2.24122.2 -> To Version 9.0.100-preview.2.24122.8

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.SharedFramework.x64.9.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.9.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.Platforms,Microsoft.SourceBuild.Intermediate.runtime.linux-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.SourceBuild.Intermediate.roslyn,Microsoft.Build,Microsoft.SourceBuild.Intermediate.msbuild,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.SourceBuild.Intermediate.emsdk
 From Version 9.0.0-preview.2.24120.1 -> To Version 9.0.0-preview.2.24121.1 (parent: Microsoft.NET.Sdk
@dotnet-maestro
Update dependencies from https://github.com/dotnet/sdk build 20240222.13
cdf7076 
Microsoft.SourceBuild.Intermediate.sdk , Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 9.0.100-preview.2.24122.2 -> To Version 9.0.100-preview.2.24122.13

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.SharedFramework.x64.9.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.9.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.Platforms,Microsoft.SourceBuild.Intermediate.runtime.linux-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.SourceBuild.Intermediate.vstest,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.SourceBuild.Intermediate.roslyn,Microsoft.Build,Microsoft.SourceBuild.Intermediate.msbuild,NuGet.Build.Tasks,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.SourceBuild.Intermediate.emsdk
 From Version 9.0.0-preview.2.24120.1 -> To Version 9.0.0-preview.2.24121.1 (parent: Microsoft.NET.Sdk
@dotnet-maestro
Update dependencies from https://github.com/dotnet/sdk build 20240222.9
bf1d436 
Microsoft.SourceBuild.Intermediate.sdk , Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 9.0.100-preview.2.24122.2 -> To Version 9.0.100-preview.2.24122.9
@dotnet-maestro
Update dependencies from https://github.com/dotnet/sdk build 20240222.11
a968d49 
Microsoft.SourceBuild.Intermediate.sdk , Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 9.0.100-preview.2.24122.9 -> To Version 9.0.100-preview.2.24122.11
@dotnet-maestro
Dependency coherency updates
5d5eedd 
Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0,VS.Redist.Common.NetCore.SharedFramework.x64.9.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.9.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.Platforms,Microsoft.SourceBuild.Intermediate.runtime.linux-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.SourceBuild.Intermediate.roslyn,Microsoft.Build,Microsoft.SourceBuild.Intermediate.msbuild,NuGet.Build.Tasks,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.SourceBuild.Intermediate.emsdk
 From Version 9.0.0-preview.2.24120.1 -> To Version 9.0.0-preview.2.24121.1 (parent: Microsoft.NET.Sdk
@dotnet-maestro
Update dependencies from https://github.com/dotnet/sdk build 20240223.1
4c45159 
Microsoft.SourceBuild.Intermediate.sdk , Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 9.0.100-preview.2.24122.2 -> To Version 9.0.100-preview.2.24123.1

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.SharedFramework.x64.9.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.9.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.Platforms,Microsoft.SourceBuild.Intermediate.runtime.linux-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.SourceBuild.Intermediate.vstest,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.SourceBuild.Intermediate.roslyn,Microsoft.Build,Microsoft.SourceBuild.Intermediate.msbuild,NuGet.Build.Tasks,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.SourceBuild.Intermediate.emsdk
 From Version 9.0.0-preview.2.24120.1 -> To Version 9.0.0-preview.2.24122.1 (parent: Microsoft.NET.Sdk
@ViktorHofer ViktorHofer mentioned this pull request Feb 23, 2024
Merged
@ViktorHofer
Copy link
Member

ViktorHofer commented Feb 23, 2024

https://dnceng.visualstudio.com/internal/_build/results?buildId=2386351&view=results should resolve the fsharp patch issues once and for all (fingers crossed).

@mthalman
Copy link
Member

mthalman commented Feb 23, 2024

I'm investigating the source build prebuilts:

/vmr/repo-projects/Directory.Build.targets(697,5): warning : 2 new packages used not in baseline! See report at /vmr/artifacts/prebuilt-report/baseline-comparison.xml for more information. Package IDs are: [/vmr/repo-projects/dotnet.proj]
/vmr/repo-projects/Directory.Build.targets(697,5): warning : Microsoft.AspNetCore.App.Ref.8.0.1 [/vmr/repo-projects/dotnet.proj]
/vmr/repo-projects/Directory.Build.targets(697,5): warning : Microsoft.NETCore.App.Ref.8.0.1 [/vmr/repo-projects/dotnet.proj]

@mthalman
Copy link
Member

mthalman commented Feb 23, 2024

I'm investigating the source build prebuilts:

/vmr/repo-projects/Directory.Build.targets(697,5): warning : 2 new packages used not in baseline! See report at /vmr/artifacts/prebuilt-report/baseline-comparison.xml for more information. Package IDs are: [/vmr/repo-projects/dotnet.proj]
/vmr/repo-projects/Directory.Build.targets(697,5): warning : Microsoft.AspNetCore.App.Ref.8.0.1 [/vmr/repo-projects/dotnet.proj]
/vmr/repo-projects/Directory.Build.targets(697,5): warning : Microsoft.NETCore.App.Ref.8.0.1 [/vmr/repo-projects/dotnet.proj]

This should be addressed by the roslyn patch I added: efdc956. There are two projects in Roslyn that are still targeting net8.0 in the context of the VMR build: CodeStyleConfigFileGenerator and CSharpSyntaxGenerator. Both of those projects use the value of the NetRoslyn MSBuild property for their target framework which is set to net8.0. This is what the patch addresses.

This patch did exist in the past but was removed in #18457. That PR also included an update to SBRP which brought in the 8.0.0 targeting packs. This solved the prebuilt issue at that time for 8.0.0 because it was provided via SBRP. But now that 8.0.1 exists, we're back to the same problem which requires the patch.

@ViktorHofer
Copy link
Member

ViktorHofer commented Feb 23, 2024

cc @jaredpar regarding the roslyn patch

@mthalman mthalman mentioned this pull request Feb 23, 2024
Closed
@dotnet-maestro dotnet-maestro bot merged commit 39605ca into main Feb 23, 2024
@dotnet-maestro dotnet-maestro bot deleted the darc-main-d1dec99f-b6b6-4b4e-bd0a-106acfb87d1a branch February 23, 2024 17:14
@jaredpar
Copy link
Member

jaredpar commented Feb 23, 2024

cc @jaredpar regarding the roslyn patch

I've commented before that the proposed patch for roslyn is incorrect. Nothing has been done to address my comments. Hence the patch has not been merged.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@lewing lewing lewing approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@ViktorHofer @mthalman @jaredpar @lewing