Skip to content

[release/10.0.1xx] Source code updates from dotnet/sdk#2334

Merged
dotnet-maestro[bot] merged 10 commits intorelease/10.0.1xxfrom
darc-release/10.0.1xx-0a936515-58f0-4863-983e-d6b245e602dd
Sep 11, 2025
Merged

[release/10.0.1xx] Source code updates from dotnet/sdk#2334
dotnet-maestro[bot] merged 10 commits intorelease/10.0.1xxfrom
darc-release/10.0.1xx-0a936515-58f0-4863-983e-d6b245e602dd

Conversation

@dotnet-maestro
Copy link
Contributor

@dotnet-maestro dotnet-maestro bot commented Sep 9, 2025

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

@dotnet-maestro
Copy link
Contributor Author

dotnet-maestro bot commented Sep 9, 2025

Important

There are conflicts with the release/10.0.1xx branch in this PR. Apart from conflicts in the source files, this means there are unresolved conflicts in the codeflow metadata file src/source-manifest.json.
When resolving these, please use the (incoming/ours) version from the PR branch. The correct content should be this:

{
  "barId": 282435,
  "path": "sdk",
  "remoteUri": "https://github.com/dotnet/sdk",
  "commitSha": "c150dbc82d39860bd78e0aa01faeb69b2822820a"
}

In case of unclarities, consult the FAQ or tag @dotnet/product-construction for assistance.

@premun
Copy link
Member

premun commented Sep 9, 2025

@baronfel can you help resolve the conflict in this PR?

@baronfel
Copy link
Member

baronfel commented Sep 9, 2025

@premun I think I did it right ;)

@mmitche
Copy link
Member

mmitche commented Sep 9, 2025

The 6.0 aspnetcore ref pack is getting pulled in here due to this change in BrowserRefresh that changed the TFM to net6: https://github.com/dotnet/dotnet/pull/2334/files#diff-d31d6383bf312e730cb56afa2ab5e0eff0df03be7229dcbc7e3ec308149fb29aR3-R7. @tmat @MichaelSimons This was removed from SBRP, and would need to get added back.

Why are we targeting net6 though? Doesn't this imply that we are supporting something running on an out of support product?

@tmat
Copy link
Member

tmat commented Sep 9, 2025

@akoeplinger
Copy link
Member

could we instead target net8.0 just for source-build?

@MichaelSimons
Copy link
Member

could we instead target net8.0 just for source-build?

It would be preferrable to avoid diverging the SB behavior as we are trying to eliminate differences in SB.

@rmarinho
Copy link
Member

Can we get this merged? its delaying maui/iOS/android to get the flow as it breaks our builds

@baronfel
Copy link
Member

Blocked by #2354 which is set to auto-merge.

This is the version available in source-build-reference-packages
@baronfel
Copy link
Member

Took a look at the VMR source-only build error:

image

The stirng.format is failing because there's an invalid property sneaking in on the .NET 10 ASpNetCore.App framework reference - the RuntimePackRuntimeIdentifiers is an MSBuild property string, not the actual resolved value

@baronfel
Copy link
Member

The SDK has a Directory.Build.targets that is setting a number of properties on the aspnetcore known frameworkreference:

  <ItemGroup Condition="$(MicrosoftAspNetCoreAppRefPackageVersion.StartsWith('$(_TargetFrameworkVersionWithoutV)'))">
    <KnownFrameworkReference Update="Microsoft.AspNetCore.App">
      <LatestRuntimeFrameworkVersion>$(MicrosoftAspNetCoreAppRefPackageVersion)</LatestRuntimeFrameworkVersion>
      <RuntimePackRuntimeIdentifiers>${SupportedRuntimeIdentifiers}</RuntimePackRuntimeIdentifiers>
      <TargetingPackVersion>$(MicrosoftAspNetCoreAppRefPackageVersion)</TargetingPackVersion>
      <DefaultRuntimeFrameworkVersion>$(MicrosoftAspNetCoreAppRefPackageVersion)</DefaultRuntimeFrameworkVersion>
    </KnownFrameworkReference>
  </ItemGroup>

it looks like a typo - need () here.

@baronfel
Copy link
Member

I changed it - but that change has been in for like 2 years - surely something else is going on here.

@akoeplinger
Copy link
Member

Interesting. We haven't seen this in #2352 which should have the equivalent changes

@akoeplinger
Copy link
Member

akoeplinger commented Sep 10, 2025

I looked at the binlog from #2352 and it does have the same typo issue there, but it doesn't cause the ProcessFrameworkReferences failure for some reason.

@dotnet-maestro dotnet-maestro bot merged commit 799e8e8 into release/10.0.1xx Sep 11, 2025
16 checks passed
@dotnet-maestro dotnet-maestro bot deleted the darc-release/10.0.1xx-0a936515-58f0-4863-983e-d6b245e602dd branch September 11, 2025 00:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

Status: Done

Development

Successfully merging this pull request may close these issues.

7 participants