[main] Source code updates from dotnet/sdk#3123
Conversation
Diff: https://github.com/dotnet/sdk/compare/65384c6536d6c6f6afa9c13dc023b1848f0ef69e..448facf6f7fbf1460517f41b84351bd03d3281c5 From: dotnet/sdk@65384c6 To: dotnet/sdk@448facf [[ commit created by automation ]]
…bc3-bc39-a7dba167d7c7
|
Note PRs from original repository included in this codeflow update:
💡 You may consult the FAQ for more information or tag @dotnet/product-construction for assistance. |
Diff: https://github.com/dotnet/sdk/compare/448facf6f7fbf1460517f41b84351bd03d3281c5..c401b59db4b1011f8f30d385a1e32dcdf0d8e07e From: dotnet/sdk@448facf To: dotnet/sdk@c401b59 [[ commit created by automation ]]
…bc3-bc39-a7dba167d7c7
|
Note PRs from original repository included in this codeflow update:
💡 You may consult the FAQ for more information or tag @dotnet/product-construction for assistance. |
Diff: https://github.com/dotnet/sdk/compare/c401b59db4b1011f8f30d385a1e32dcdf0d8e07e..26bbbd92e5a3cc58037e696147fa25e03e68e3a8 From: dotnet/sdk@c401b59 To: dotnet/sdk@26bbbd9 [[ commit created by automation ]]
…bc3-bc39-a7dba167d7c7
|
Note PRs from original repository included in this codeflow update:
💡 You may consult the FAQ for more information or tag @dotnet/product-construction for assistance. |
Diff: https://github.com/dotnet/sdk/compare/26bbbd92e5a3cc58037e696147fa25e03e68e3a8..124e7cd9ebb9db082dcfe6277e8e5fe175c03c9b From: dotnet/sdk@26bbbd9 To: dotnet/sdk@124e7cd [[ commit created by automation ]]
…bc3-bc39-a7dba167d7c7
|
Note PRs from original repository included in this codeflow update: 💡 You may consult the FAQ for more information or tag @dotnet/product-construction for assistance. |
Diff: https://github.com/dotnet/sdk/compare/124e7cd9ebb9db082dcfe6277e8e5fe175c03c9b..3f743a996476c6051c6896e275809c897fb3f50d From: dotnet/sdk@124e7cd To: dotnet/sdk@3f743a9 [[ commit created by automation ]]
…bc3-bc39-a7dba167d7c7
|
Note PRs from original repository included in this codeflow update:
💡 You may consult the FAQ for more information or tag @dotnet/product-construction for assistance. |
Diff: https://github.com/dotnet/sdk/compare/3f743a996476c6051c6896e275809c897fb3f50d..6a6992f5fc42dbd06cd24f3a7db40013035d3965 From: dotnet/sdk@3f743a9 To: dotnet/sdk@6a6992f [[ commit created by automation ]]
…bc3-bc39-a7dba167d7c7
|
Note PRs from original repository included in this codeflow update: 💡 You may consult the FAQ for more information or tag @dotnet/product-construction for assistance. |
|
Important There was a conflict in the PR branch when flowing source from https://github.com/dotnet/sdk/tree/0292a8566a346cfda579824d25eafbb7784bb2c2
Updates from this subscription will be blocked until the conflict is resolved, or the PR is merged 💡 You may consult the FAQ for more information or tag @dotnet/product-construction for assistance. |
|
@MichaelSimons from what I can see the initial error was why is it trying to restore the linux-x64 runtime pack and not the centos.10-x64 which was produced by the build? I think this is the real issue and we were just masking it before. |
This reverts commit 1a9fed2.
|
Important The source repository has received code changes from an opposite flow. Any additional codeflows into this PR may potentially result in lost changes. Please continue with one of the following options:
💡 You may consult the FAQ for more information or tag @dotnet/prodconsvcs for assistance. |
The reason for this stems from https://github.com/dotnet/dotnet/pull/3123/files#diff-b3a09e242d3219b910364fa94d2654b8ec17d19a5f79a924eba97da538fba4a0R707. Source-build dynamically adds the current RID to NetCoreAppHostRids, NetCoreRuntimePackRids, and AspNetCoreRuntimePackRids here because those are the packs it builds. Because the 10 known framework reference was updated to The other problem is that all of the I don't think that is something to fix in this PR. My recommendation is to disable the source-build web scenario test until the templates have been updated and log a tracking issue to re-enable them. |
|
Hmm this is blocking the rebranding work to some degree. We can workaround it (by making changes directly there) but no dependency flow from sdk into the VMR for over 6 weeks is tragic. cc @marcpopMSFT Doesn't look like there's much work left here? Some assembly that fails to get invoked via dotnet in the fsharp repo. |
|
In the bootstrap of fsharp of source build stage 2, it's trying to reference
Investigating... |
This is caused by the same issue described in #3123 (comment), specifically this change: dotnet/sdk#51429. It causes the <KnownFrameworkReference Include="Microsoft.NETCore.App"
TargetFramework="net10.0"
RuntimeFrameworkName="Microsoft.NETCore.App"
DefaultRuntimeFrameworkVersion="10.0.0-ci"
LatestRuntimeFrameworkVersion="10.0.0-ci"
TargetingPackName="Microsoft.NETCore.App.Ref"
TargetingPackVersion="10.0.0-ci"
RuntimePackNamePatterns="Microsoft.NETCore.App.Runtime.**RID**"
RuntimePackRuntimeIdentifiers="linux-arm;linux-arm64;linux-musl-arm64;linux-musl-x64;linux-x64;osx-x64;tizen.4.0.0-armel;tizen.5.0.0-armel;win-arm64;win-x64;win-x86;linux-musl-arm;osx-arm64;linux-s390x;linux-loongarch64;linux-bionic-arm;linux-bionic-arm64;linux-bionic-x64;linux-bionic-x86;linux-ppc64le;freebsd-x64;freebsd-arm64;linux-riscv64;linux-musl-riscv64;linux-musl-loongarch64;android-arm64;android-x64"
/>This lacks the @akoeplinger - You mention that this could be resolved by the .NET 11 rebranding? dotnet/sdk#51429 (comment) |
|
@akoeplinger - The rebranding changes didn't fix anything. Still getting the same error due to using the portable RID: https://dev.azure.com/dnceng-public/public/_build/results?buildId=1220819&view=logs&jobId=3d049f34-eb7f-5dcd-1393-71cd43c7f766&j=3d049f34-eb7f-5dcd-1393-71cd43c7f766&t=c7dd373c-04d4-57bb-b62b-5b0308668e5e. If dotnet/sdk#51429 has the correct changes, then what is the correct fix for this? |
Note
This is a codeflow update. It may contain both source code changes from the source repo as well as dependency updates. Learn more here.
This pull request brings the following source code changes
From https://github.com/dotnet/sdk