Skip to content

[release/7.0.1xx] Update dependencies from dotnet/sdk#14616

Merged
v-wuzhai merged 8 commits intorelease/7.0.1xxfrom
darc-release/7.0.1xx-aaa9a7ec-ca46-4f1a-b8e4-bfe19157990c
Sep 30, 2022
Merged

[release/7.0.1xx] Update dependencies from dotnet/sdk#14616
v-wuzhai merged 8 commits intorelease/7.0.1xxfrom
darc-release/7.0.1xx-aaa9a7ec-ca46-4f1a-b8e4-bfe19157990c

Conversation

@dotnet-maestro
Copy link
Copy Markdown

@dotnet-maestro dotnet-maestro Bot commented Sep 29, 2022

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 7.0.0-rtm.22476.10 to 7.0.0-rtm.22478.5 (parent: Microsoft.NET.Sdk)
    • VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0: from 7.0.0-rtm.22476.10 to 7.0.0-rtm.22478.5 (parent: Microsoft.NET.Sdk)
    • VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0: from 7.0.0-rtm.22476.10 to 7.0.0-rtm.22478.5 (parent: Microsoft.NET.Sdk)
    • Microsoft.NETCore.App.Runtime.win-x64: from 7.0.0-rtm.22476.12 to 7.0.0-rtm.22478.9 (parent: Microsoft.NET.Sdk)
    • Microsoft.NETCore.App.Ref: from 7.0.0-rtm.22476.12 to 7.0.0-rtm.22478.9 (parent: Microsoft.NET.Sdk)
    • VS.Redist.Common.NetCore.TargetingPack.x64.7.0: from 7.0.0-rtm.22476.12 to 7.0.0-rtm.22478.9 (parent: Microsoft.NET.Sdk)
    • Microsoft.NETCore.App.Host.win-x64: from 7.0.0-rtm.22476.12 to 7.0.0-rtm.22478.9 (parent: Microsoft.NET.Sdk)
    • Microsoft.NETCore.DotNetHostResolver: from 7.0.0-rtm.22476.12 to 7.0.0-rtm.22478.9 (parent: Microsoft.NET.Sdk)
    • Microsoft.NETCore.Platforms: from 7.0.0-rtm.22476.12 to 7.0.0-rtm.22478.9 (parent: Microsoft.NET.Sdk)
    • Microsoft.AspNetCore.App.Ref: from 7.0.0-rtm.22477.1 to 7.0.0-rtm.22479.3 (parent: Microsoft.NET.Sdk)
    • Microsoft.AspNetCore.App.Ref.Internal: from 7.0.0-rtm.22477.1 to 7.0.0-rtm.22479.3 (parent: Microsoft.NET.Sdk)
    • Microsoft.AspNetCore.App.Runtime.win-x64: from 7.0.0-rtm.22477.1 to 7.0.0-rtm.22479.3 (parent: Microsoft.NET.Sdk)
    • VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0: from 7.0.0-rtm.22477.1 to 7.0.0-rtm.22479.3 (parent: Microsoft.NET.Sdk)
    • dotnet-dev-certs: from 7.0.0-rtm.22477.1 to 7.0.0-rtm.22479.3 (parent: Microsoft.NET.Sdk)
    • dotnet-user-jwts: from 7.0.0-rtm.22477.1 to 7.0.0-rtm.22479.3 (parent: Microsoft.NET.Sdk)
    • dotnet-user-secrets: from 7.0.0-rtm.22477.1 to 7.0.0-rtm.22479.3 (parent: Microsoft.NET.Sdk)
    • Microsoft.WindowsDesktop.App.Runtime.win-x64: from 7.0.0-rtm.22476.10 to 7.0.0-rtm.22478.5 (parent: Microsoft.NET.Sdk)
    • Microsoft.WindowsDesktop.App.Runtime.win-x64: from 7.0.0-rtm.22476.10 to 7.0.0-rtm.22478.5 (parent: Microsoft.NET.Sdk)
    • Microsoft.Net.Compilers.Toolset: from 4.4.0-2.22464.20 to 4.4.0-3.22478.13 (parent: Microsoft.NET.Sdk)
    • Microsoft.Build: from 17.4.0-preview-22477-01 to 17.4.0-preview-22479-02 (parent: Microsoft.NET.Sdk)
    • VS.Redist.Common.NetCore.SharedFramework.x64.7.0: from 7.0.0-rtm.22476.12 to 7.0.0-rtm.22478.9 (parent: Microsoft.NET.Sdk)
    • VS.Redist.Common.NetCore.SharedFramework.x64.7.0: from 7.0.0-rtm.22476.12 to 7.0.0-rtm.22478.9 (parent: Microsoft.NET.Sdk)

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

  • Subscription: 954a90b8-b6f2-4bea-40e6-08da7ef5fc68
  • Build: 20220929.10
  • Date Produced: September 29, 2022 8:23:16 PM UTC
  • Commit: da2c864
  • Branch: refs/heads/release/7.0.1xx

Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.100-rtm.22478.5 -> To Version 7.0.100-rtm.22478.9

Dependency coherency updates

Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,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.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.Build,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,VS.Redist.Common.NetCore.SharedFramework.x64.7.0
 From Version 7.0.0-rtm.22476.12 -> To Version 7.0.0-rtm.22478.4 (parent: Microsoft.NET.Sdk
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.100-rtm.22478.5 -> To Version 7.0.100-rtm.22478.12

Dependency coherency updates

Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,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.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Net.Compilers.Toolset,Microsoft.Build,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,VS.Redist.Common.NetCore.SharedFramework.x64.7.0
 From Version 7.0.0-rtm.22476.10 -> To Version 7.0.0-rtm.22478.5 (parent: Microsoft.NET.Sdk
@v-wuzhai
Copy link
Copy Markdown

@dotnet/source-build-internal Could you take a look at the failures here?

dotnet-maestro Bot and others added 3 commits September 29, 2022 11:02
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.100-rtm.22478.5 -> To Version 7.0.100-rtm.22479.3

Dependency coherency updates

Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,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.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Net.Compilers.Toolset,Microsoft.Build,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,VS.Redist.Common.NetCore.SharedFramework.x64.7.0
 From Version 7.0.0-rtm.22476.10 -> To Version 7.0.0-rtm.22478.5 (parent: Microsoft.NET.Sdk
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.100-rtm.22478.5 -> To Version 7.0.100-rtm.22479.5

Dependency coherency updates

Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,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.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Net.Compilers.Toolset,Microsoft.Build,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,VS.Redist.Common.NetCore.SharedFramework.x64.7.0
 From Version 7.0.0-rtm.22476.10 -> To Version 7.0.0-rtm.22478.5 (parent: Microsoft.NET.Sdk
@MichaelSimons MichaelSimons requested a review from a team as a code owner September 29, 2022 14:19
@MichaelSimons
Copy link
Copy Markdown
Member

@dotnet/source-build-internal Could you take a look at the failures here?

I have pushed a fix.

@MichaelSimons
Copy link
Copy Markdown
Member

cc @lbussell - the latest roslyn compiler is flowing in so the runtime patch is needed you prepped.

@MichaelSimons
Copy link
Copy Markdown
Member

@rainersigwald, @jaredpar - Source-build is failing to build msbuild with there changes with the following errors. I am assuming this is an issue caused by building msbuild with the latest roslyn flowing in here.

    /repos/tarball-temp/src/msbuild/artifacts/source-build/self/src/src/StringTools/InternableString.cs(173,39): error CS8170: Struct members cannot return 'this' or other instance members by reference [/repos/tarball-temp/src/msbuild/artifacts/source-build/self/src/src/StringTools/StringTools.csproj::TargetFramework=net7.0]
    /repos/tarball-temp/src/msbuild/artifacts/source-build/self/src/src/StringTools/InternableString.cs(173,20): error CS8347: Cannot use a result of 'InternableString.Enumerator.Enumerator(ref InternableString)' in this context because it may expose variables referenced by parameter 'str' outside of their declaration scope [/repos/tarball-temp/src/msbuild/artifacts/source-build/self/src/src/StringTools/StringTools.csproj::TargetFramework=net7.0]

@rainersigwald
Copy link
Copy Markdown
Member

Looks like something we worked around but then backed out the workaround for (dotnet/msbuild#7790 (comment)).

@rainersigwald
Copy link
Copy Markdown
Member

. . . but that was fixed in later Roslyn, so I'm confused about what's happening here.

@jaredpar
Copy link
Copy Markdown
Member

@rainersigwald

internal Enumerator(ref InternableString str)

Needs to be

internal Enumerator(scoped ref InternableString str)

@MichaelSimons
Copy link
Copy Markdown
Member

Thanks @jaredpar and @rainersigwald. I added a source-build patch to unblock this dependency flow I also opened a tracking issue in msbuild. I would appreciate sign-off on the source-build patch until msbuild picks up the new roslyn version.

@rainersigwald
Copy link
Copy Markdown
Member

patch lgtm.

@jaredpar is that a required permanent fix? I thought it was a workaround for a now-fixed bug, which is why I reverted it.

@jaredpar
Copy link
Copy Markdown
Member

jaredpar commented Sep 29, 2022

@jaredpar is that a required permanent fix?

It's permanent until we change the design again 😄

I thought it was a workaround for a now-fixed bug, which is why I reverted it.

How ref capture works is a core problem we've been struggling with in the ref field design. The initial design went too far into the "let everything be captured" space, that lead to a number of compat breaks so we tweaked on aspect severely in the other direction, and after more refinement ended up in a more explainable place. Essentially any ref can be captured in the return of the method or out parameters. In this case it's a ctor, it has a ref so that can be captured but you don't intend that here so scoped to tell us it can't happen.

Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.100-rtm.22478.5 -> To Version 7.0.100-rtm.22479.10

Dependency coherency updates

Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,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.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Net.Compilers.Toolset,Microsoft.Build,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,VS.Redist.Common.NetCore.SharedFramework.x64.7.0
 From Version 7.0.0-rtm.22476.10 -> To Version 7.0.0-rtm.22478.5 (parent: Microsoft.NET.Sdk
@v-wuzhai v-wuzhai merged commit c286525 into release/7.0.1xx Sep 30, 2022
@v-wuzhai v-wuzhai deleted the darc-release/7.0.1xx-aaa9a7ec-ca46-4f1a-b8e4-bfe19157990c branch September 30, 2022 01:43
rainersigwald pushed a commit to rainersigwald/msbuild that referenced this pull request Sep 30, 2022
Backport: dotnet/installer#14616

Co-Authored-By: Jared Parsons <jaredpar@microsoft.com>
Forgind pushed a commit to dotnet/msbuild that referenced this pull request Sep 30, 2022
Backport: dotnet/installer#14616

Co-Authored-By: Jared Parsons <jaredpar@microsoft.com>

Co-authored-by: MichaelSimons <msimons@microsoft.com>
Co-authored-by: Jared Parsons <jaredpar@microsoft.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants