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.

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

[main] Update dependencies from dotnet/sdk #15389

Merged
merged 14 commits into from
Feb 7, 2023
Merged

[main] Update dependencies from dotnet/sdk #15389

merged 14 commits into from
Feb 7, 2023

Conversation

dotnet-maestro[bot]
Copy link

@dotnet-maestro dotnet-maestro bot commented Feb 1, 2023 •
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 8.0.0-alpha.1.23078.1 to 8.0.0-preview.2.23106.1 (parent: Microsoft.NET.Sdk)
    • VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0: from 8.0.0-alpha.1.23078.1 to 8.0.0-preview.2.23106.1 (parent: Microsoft.NET.Sdk)
    • VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0: from 8.0.0-alpha.1.23078.1 to 8.0.0-preview.2.23106.1 (parent: Microsoft.NET.Sdk)
    • VS.Redist.Common.NetCore.SharedFramework.x64.8.0: from 8.0.0-alpha.1.23080.2 to 8.0.0-preview.2.23106.6 (parent: Microsoft.NET.Sdk)
    • Microsoft.NETCore.App.Ref: from 8.0.0-alpha.1.23080.2 to 8.0.0-preview.2.23106.6 (parent: Microsoft.NET.Sdk)
    • VS.Redist.Common.NetCore.TargetingPack.x64.8.0: from 8.0.0-alpha.1.23080.2 to 8.0.0-preview.2.23106.6 (parent: Microsoft.NET.Sdk)
    • Microsoft.NETCore.App.Runtime.win-x64: from 8.0.0-alpha.1.23080.2 to 8.0.0-preview.2.23106.6 (parent: Microsoft.NET.Sdk)
    • Microsoft.NETCore.App.Host.win-x64: from 8.0.0-alpha.1.23080.2 to 8.0.0-preview.2.23106.6 (parent: Microsoft.NET.Sdk)
    • Microsoft.NETCore.DotNetHostResolver: from 8.0.0-alpha.1.23080.2 to 8.0.0-preview.2.23106.6 (parent: Microsoft.NET.Sdk)
    • Microsoft.NETCore.Platforms: from 8.0.0-alpha.1.23080.2 to 8.0.0-preview.2.23106.6 (parent: Microsoft.NET.Sdk)
    • Microsoft.AspNetCore.App.Ref: from 8.0.0-alpha.1.23079.1 to 8.0.0-preview.2.23106.9 (parent: Microsoft.NET.Sdk)
    • Microsoft.AspNetCore.App.Ref.Internal: from 8.0.0-alpha.1.23079.1 to 8.0.0-preview.2.23106.9 (parent: Microsoft.NET.Sdk)
    • Microsoft.AspNetCore.App.Runtime.win-x64: from 8.0.0-alpha.1.23079.1 to 8.0.0-preview.2.23106.9 (parent: Microsoft.NET.Sdk)
    • VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0: from 8.0.0-alpha.1.23079.1 to 8.0.0-preview.2.23106.9 (parent: Microsoft.NET.Sdk)
    • dotnet-dev-certs: from 8.0.0-alpha.1.23079.1 to 8.0.0-preview.2.23106.9 (parent: Microsoft.NET.Sdk)
    • dotnet-user-jwts: from 8.0.0-alpha.1.23079.1 to 8.0.0-preview.2.23106.9 (parent: Microsoft.NET.Sdk)
    • dotnet-user-secrets: from 8.0.0-alpha.1.23079.1 to 8.0.0-preview.2.23106.9 (parent: Microsoft.NET.Sdk)
    • Microsoft.WindowsDesktop.App.Runtime.win-x64: from 8.0.0-alpha.1.23078.1 to 8.0.0-preview.2.23106.1 (parent: Microsoft.NET.Sdk)
    • Microsoft.Dotnet.WinForms.ProjectTemplates: from 8.0.0-alpha.1.23077.1 to 8.0.0-preview.2.23080.8 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
    • Microsoft.WindowsDesktop.App.Runtime.win-x64: from 8.0.0-alpha.1.23078.1 to 8.0.0-preview.2.23106.1 (parent: Microsoft.NET.Sdk)
    • Microsoft.DotNet.Wpf.ProjectTemplates: from 8.0.0-alpha.1.23077.2 to 8.0.0-preview.2.23105.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
    • Microsoft.FSharp.Compiler: from 12.5.0-beta.23069.2 to 12.5.0-beta.23103.4 (parent: Microsoft.NET.Sdk)
    • Microsoft.SourceBuild.Intermediate.fsharp: from 7.0.200-beta.23069.2 to 7.0.300-beta.23103.4 (parent: Microsoft.NET.Sdk)
    • Microsoft.NET.Test.Sdk: from 17.6.0-preview-20230126-02 to 17.6.0-preview-20230202-02 (parent: Microsoft.NET.Sdk)
    • Microsoft.NET.ILLink.Tasks: from 8.0.100-1.23067.1 to 8.0.0-preview.2.23106.6 (parent: Microsoft.NET.Sdk)
    • Microsoft.Net.Compilers.Toolset: from 4.5.0-6.23078.4 to 4.6.0-1.23101.17 (parent: Microsoft.NET.Sdk)
    • Microsoft.Build: from 17.6.0-preview-23077-01 to 17.6.0-preview-23106-07 (parent: Microsoft.NET.Sdk)
    • NuGet.Build.Tasks: from 6.5.0-rc.149 to 6.6.0-preview.1.17 (parent: Microsoft.NET.Sdk)

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

  • Subscription: f5e16d6d-e643-4370-f3ed-08d8e97c775d
  • Build: 20230207.1
  • Date Produced: February 7, 2023 9:03:22 AM UTC
  • Commit: 2fd62c3
  • Branch: refs/heads/main

@dotnet-maestro
Copy link
Author

dotnet-maestro bot commented Feb 1, 2023

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

@dotnet/domestic-cat

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/sdk) 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

@v-wuzhai v-wuzhai requested a review from premun February 2, 2023 03:09
@Tratcher Tratcher force-pushed the darc-main-6d46f5d5-1943-4e98-8628-35bfa7fb272e branch from aa9aa0d to e09ac16 Compare February 2, 2023 21:46
@premun
Copy link
Member

premun commented Feb 3, 2023

@MichaelSimons seems like this change adds the cecil repo. Is that desired?

@MichaelSimons
Copy link
Member

@MichaelSimons seems like this change adds the cecil repo. Is that desired?

Yes, that is expected with the work to move linker into runtime. It is essentially being changed from a submodule in linker to a repo reference in runtime.

@MichaelSimons
Copy link
Member

@premun - Can you help add the required source-mappings for cecil?

@premun
Copy link
Member

premun commented Feb 6, 2023

@premun Premek Vysoky FTE - Can you help add the required source-mappings for cecil?

Sure, will do, that should be very straightforward. But don't we also need things such as the repo-project?

@MichaelSimons
Copy link
Member

I was going to log a separate issue for that work as not not hold up this dependency flow.

@premun premun requested a review from a team as a code owner February 6, 2023 14:38
@MichaelSimons MichaelSimons mentioned this pull request Feb 6, 2023
Closed
@MichaelSimons
Copy link
Member

I opened dotnet/source-build#3232 to track building cecil in source-build.

@premun
Copy link
Member

premun commented Feb 6, 2023

The synchronization failed again with:

fail: Failed to synchronize repo installer
      Something went wrong when checking out 8521541d63e59bfdd7d9d27295a42e3e2b613857 in /mnt/vss/_work/_temp/linker.

I am going to investigate this

@premun
Copy link
Member

premun commented Feb 6, 2023

@MichaelSimons the synchronization error is different - it comes from the fact that the SourceBuild tag for linker points to runtime:

installer/eng/Version.Details.xml

Lines 145 to 150 in 3b853e5

<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="8.0.0-preview.2.23105.2" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>/~https://github.com/dotnet/runtime</Uri>
<Sha>8521541d63e59bfdd7d9d27295a42e3e2b613857</Sha>
<SourceBuild RepoName="linker" ManagedOnly="true" />
<RepoName>linker</RepoName>
</Dependency>

@premun
Copy link
Member

premun commented Feb 6, 2023 •
edited
Loading

This seems like it might be a bad merge: 5b8f988

This was the force push in this PR

@premun
Copy link
Member

premun commented Feb 6, 2023

@Tratcher can you share why a force push (5b8f988) was needed? What happened there? A conflict with main?

@premun
Copy link
Member

premun commented Feb 6, 2023

I will reset to main and run the update again. I checked all changes in main and saw no package that is being changed here getting a change as well so I'd assume it should be safe this way.

@premun premun force-pushed the darc-main-6d46f5d5-1943-4e98-8628-35bfa7fb272e branch from 3b853e5 to f17134b Compare February 6, 2023 15:48
dotnet-maestro bot and others added 5 commits February 6, 2023 16:36
@dotnet-maestro
Update dependencies from /~https://github.com/dotnet/sdk build 20230206.1
39f3f26 
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 8.0.100-alpha.1.23080.9 -> To Version 8.0.100-preview.2.23106.1

Dependency coherency updates

Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,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.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,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.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks
 From Version 8.0.0-alpha.1.23078.1 -> To Version 8.0.0-preview.2.23104.2 (parent: Microsoft.NET.Sdk
@premun
Remove the linker SourceBuild tag
1ed54d2
@dotnet-maestro
Update dependencies from /~https://github.com/dotnet/sdk build 20230206.2
583cef3 
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 8.0.100-alpha.1.23080.9 -> To Version 8.0.100-preview.2.23106.2

Dependency coherency updates

Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,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.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,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.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks
 From Version 8.0.0-alpha.1.23078.1 -> To Version 8.0.0-preview.2.23104.2 (parent: Microsoft.NET.Sdk
@dotnet-maestro
Update dependencies from /~https://github.com/dotnet/sdk build 20230206.4
99526da 
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 8.0.100-alpha.1.23080.9 -> To Version 8.0.100-preview.2.23106.4

Dependency coherency updates

Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,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.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,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.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks
 From Version 8.0.0-alpha.1.23078.1 -> To Version 8.0.0-preview.2.23104.2 (parent: Microsoft.NET.Sdk
@dotnet-maestro
Update dependencies from /~https://github.com/dotnet/sdk build 20230206.5
e564cf5 
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 8.0.100-alpha.1.23080.9 -> To Version 8.0.100-preview.2.23106.5

Dependency coherency updates

Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,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.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,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.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks
 From Version 8.0.0-alpha.1.23078.1 -> To Version 8.0.0-preview.2.23104.2 (parent: Microsoft.NET.Sdk
@Tratcher
Copy link
Member

Tratcher commented Feb 6, 2023

I didn't explicitly do a force push, I think I just asked github to rebase to see if that addressed some build failures. Take any steps you deem necessary to fix it.

@dotnet-maestro
Update dependencies from /~https://github.com/dotnet/sdk build 20230206.6
5165e0f 
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 8.0.100-alpha.1.23080.9 -> To Version 8.0.100-preview.2.23106.6

Dependency coherency updates

Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,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.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,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.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks
 From Version 8.0.0-alpha.1.23078.1 -> To Version 8.0.0-preview.2.23104.2 (parent: Microsoft.NET.Sdk
@tlakollo
Copy link

tlakollo commented Feb 6, 2023 •
edited
Loading

@premun you mentioned in the past that we might need to get rid of linker information in the source-mappings. Is this the right moment? Or do we need it for branches that are not main?

@tlakollo
Copy link

tlakollo commented Feb 7, 2023 •
edited
Loading

My suspicion on the current failures is that we are trying to consume the new Microsoft.ILLink.Tasks package produced by runtime using an old SDK code (or using a new SDK code with an old Microsoft.ILLink.Tasks). The illink project while it was being produced inside dotnet/linker produced the Microsoft.ILLink.Tasks and the Microsoft.ILLink.Analyzers packages. After the package is produced from dotnet/runtime we now only produce a single package Microsoft.ILLink.Tasks that contain information about both the package and the analyzer. I modified the SDK redist to be able to find the analyzer inside Microsoft.ILLink.Tasks package see src/Layout/redist/targets/GenerateLayout.targets inside the following PR
Given that is printing this warning I think we are using old SDK/old ILLink code that fails to locate the analyzer, but I couldn't test my theory because I'm not sure how to setup the VMR

@dotnet-maestro
Update dependencies from /~https://github.com/dotnet/sdk build 20230206.7
5763235 
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 8.0.100-alpha.1.23080.9 -> To Version 8.0.100-preview.2.23106.7

Dependency coherency updates

Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,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.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,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.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks
 From Version 8.0.0-alpha.1.23078.1 -> To Version 8.0.0-preview.2.23104.2 (parent: Microsoft.NET.Sdk
@dotnet-maestro
Update dependencies from /~https://github.com/dotnet/sdk build 20230206.11
c1e1c68 
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 8.0.100-alpha.1.23080.9 -> To Version 8.0.100-preview.2.23106.11

Dependency coherency updates

Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,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.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,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.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks
 From Version 8.0.0-alpha.1.23078.1 -> To Version 8.0.0-preview.2.23106.1 (parent: Microsoft.NET.Sdk
dotnet-maestro bot and others added 3 commits February 7, 2023 08:08
@dotnet-maestro
Update dependencies from /~https://github.com/dotnet/sdk build 20230206.14
f65e39b 
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 8.0.100-alpha.1.23080.9 -> To Version 8.0.100-preview.2.23106.14

Dependency coherency updates

Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,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.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,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.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks
 From Version 8.0.0-alpha.1.23078.1 -> To Version 8.0.0-preview.2.23106.1 (parent: Microsoft.NET.Sdk
@premun
Merge branch 'main' into darc-main-6d46f5d5-1943-4e98-8628-35bfa7fb272e
3f785c6
@dotnet-maestro
Update dependencies from /~https://github.com/dotnet/sdk build 20230207.1
585aadb 
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 8.0.100-alpha.1.23080.9 -> To Version 8.0.100-preview.2.23107.1

Dependency coherency updates

Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,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.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,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.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks
 From Version 8.0.0-alpha.1.23078.1 -> To Version 8.0.0-preview.2.23106.1 (parent: Microsoft.NET.Sdk
@premun
Copy link
Member

premun commented Feb 7, 2023 •
edited
Loading

Hey @tlakollo,

I spoke with @vitek-karas about this today and I'll give you some more context so we can figure out the next steps.

First - my understanding is that linker depends on cecil and cecil used to be a submodule. Now cecil will be a first-class repo in the VMR so source build needs to be told about it so that it can build it. So the change we need to ultimately make is add dotnet/cecil into the source build and make runtime depend on it.

That being said, there is a difference between what is physically in the VMR and what the source build knows about. Each repo has a corresponding repo-project file that is used by the source build to figure out how to build the repo and when (what are its dependencies).
Example: /~https://github.com/dotnet/dotnet/blob/main/repo-projects/linker.proj
The whole process of adding a new repository is described here: /~https://github.com/dotnet/source-build/blob/main/Documentation/sourcebuild-in-repos/new-repo.md

Now.. we should also think about this PR and whether we can take some immediate quick steps to unblock it, and then incorporate cecil into source build without blocking the code flow.

At the moment, since we haven't changed anything, we're still building dotnet/linker in the source build.

The way I see it, we have 3 options:

  1. Put some workaround in place that would suppress the warning/error/test and unblock the code flow. This can be done by introducing a VMR souce build patch which modifies files in the VMR. Introduce cecil into SB and remove linker later.

  2. Remove linker but not introduce cecil in SB yet and let the linker package become a prebuilt (package we do not source-build but download from feed). This would temporarily be okay as long as we later configure SB to build the package itself. Introduce cecil into SB later which would remove the prebuilt.

  3. Last possibility is to fix the issue but that requires incorporating cecil in SB and that might take time so this would block the code flow.

@MichaelSimons please correct me, if I got anything wrong. My understanding is that we want to prioritize unblocking (so not 3.).

@MichaelSimons MichaelSimons requested a review from a team as a code owner February 7, 2023 15:27
@marek-safar
Copy link

Just for better context, Cecil is a very simple library with no dependencies.

@MichaelSimons
Copy link
Member

While I appreciate Cecil is a simple library, I agree with @premun, that we want to prioritize unblocking this dependency flow. I pushed a fix for @premun 2nd suggestion.

@MichaelSimons
Copy link
Member

The source-build leg passes now. Someone needs to address or signoff on the automerge downgrades.

@mmitche
Copy link
Member

mmitche commented Feb 7, 2023

Ahh, the ILLink tasks version number change. I think that is intentional as linker is moving into the runtime repo.

@MichaelSimons MichaelSimons merged commit 63fbbf3 into main Feb 7, 2023
@MichaelSimons MichaelSimons deleted the darc-main-6d46f5d5-1943-4e98-8628-35bfa7fb272e branch February 7, 2023 17:12
@MichaelSimons MichaelSimons mentioned this pull request Feb 7, 2023
Closed
3 tasks
@tlakollo
Copy link

tlakollo commented Feb 7, 2023

First - my understanding is that linker depends on cecil and cecil used to be a submodule. Now cecil will be a first-class repo in the VMR so source build needs to be told about it so that it can build it. So the change we need to ultimately make is add dotnet/cecil into the source build and make runtime depend on it.

So I followed already most of the instructions on that page, cecil is source buildable, the pipeline creates the intermediate packages and runtime consumes cecil and flags it as a source build dependency. I'm working on adding the VMR part taking as a base what got deleted in this PR for linker.

@MichaelSimons
Copy link
Member

@tlakollo - I opened dotnet/source-build#3232 to track this work. I had asked @mthalman to fix this but if you are already working on it, please take ownership of the issue and let Matt know. If you have any questions post them in the issue and the source-build team can help out. TIA.

@tlakollo
Copy link

tlakollo commented Feb 7, 2023

@tlakollo - I opened dotnet/source-build#3232 to track this work. I had asked @mthalman to fix this but if you are already working on it, please take ownership of the issue and let Matt know. If you have any questions post them in the issue and the source-build team can help out. TIA.

Ahh yeah I answered before I finished reading my mail, then I saw the other update. I haven't started to write code so I can just let Matt handle it :)

@tlakollo tlakollo mentioned this pull request Feb 8, 2023
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@MichaelSimons MichaelSimons MichaelSimons approved these changes

@premun premun Awaiting requested review from premun

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@premun @MichaelSimons @Tratcher @tlakollo @marek-safar @mmitche