Skip to content

[main] Source code updates from dotnet/dotnet #63109

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

Open
wants to merge 28 commits into
base: main
Choose a base branch
from
+508 −642
Open

[main] Source code updates from dotnet/dotnet #63109

Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
9015be4
Backflow from https://github.com/dotnet/dotnet / 8b29a16 build 277635
dotnet-maestro[bot] Aug 4, 2025
412bd92
Merge main into darc-main-3d5cc7ef-a367-4705-bbbd-46477514215d
dotnet-maestro[bot] Aug 4, 2025
64c2f8f
Update dependencies from https://github.com/dotnet/dotnet build 277635
dotnet-maestro[bot] Aug 4, 2025
78fef53
Backflow from https://github.com/dotnet/dotnet / 8cb85e0 build 278022
dotnet-maestro[bot] Aug 6, 2025
b9b3ea1
Update dependencies from https://github.com/dotnet/dotnet build 278022
dotnet-maestro[bot] Aug 6, 2025
2eadab8
Merge branch 'main' into darc-main-3d5cc7ef-a367-4705-bbbd-46477514215d
lewing Aug 6, 2025
9ebd69b
Backflow from https://github.com/dotnet/dotnet / 30bc8f9 build 278224
dotnet-maestro[bot] Aug 7, 2025
fc4033d
Update dependencies from https://github.com/dotnet/dotnet build 278224
dotnet-maestro[bot] Aug 7, 2025
9e28a3d
Enable restore graph logging for more diagnostics
jkoritzinsky Aug 7, 2025
2a04856
Revert "Enable restore graph logging for more diagnostics"
jkoritzinsky Aug 7, 2025
aa77ee0
Update KnownILLinkPack/KnownILCompilerPack instead of using a Package…
jkoritzinsky Aug 7, 2025
232f623
Apply suggestions from code review
BrennanConroy Aug 7, 2025
3054439
Merge main into darc-main-3d5cc7ef-a367-4705-bbbd-46477514215d
dotnet-maestro[bot] Aug 8, 2025
4f6102c
Update dependencies from https://github.com/dotnet/dotnet build 278405
dotnet-maestro[bot] Aug 8, 2025
2b4d47c
Apply suggestions from code review
BrennanConroy Aug 8, 2025
8c90285
Add base href for GlobalizationWasmApp
maraf Aug 8, 2025
706067e
Merge main into darc-main-3d5cc7ef-a367-4705-bbbd-46477514215d
dotnet-maestro[bot] Aug 9, 2025
ebe715a
Update dependencies from https://github.com/dotnet/dotnet build 278512
dotnet-maestro[bot] Aug 9, 2025
2846040
Disable HotReload in WasmMinimal
maraf Aug 9, 2025
b92451b
Disable HotReload in CustomBasePathApp and HostedInAspNet.Client
maraf Aug 9, 2025
6e1e958
Apply suggestions from code review
BrennanConroy Aug 10, 2025
037aba8
Backflow from https://github.com/dotnet/dotnet / e9f665e build 278626
dotnet-maestro[bot] Aug 11, 2025
a4b66b3
Merge main into darc-main-3d5cc7ef-a367-4705-bbbd-46477514215d
dotnet-maestro[bot] Aug 11, 2025
f2ccafb
Update dependencies from https://github.com/dotnet/dotnet build 278626
dotnet-maestro[bot] Aug 11, 2025
a9b6a96
Add base href for GlobalizationWasmApp
maraf Aug 11, 2025
3feb515
Update KnownILLinkPack/KnownILCompilerPack instead of using a Package…
jkoritzinsky Aug 7, 2025
aa211b2
Apply suggestions from code review
BrennanConroy Aug 7, 2025
78ec198
Update dependencies from https://github.com/dotnet/dotnet build 278647
dotnet-maestro[bot] Aug 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
198 changes: 98 additions & 100 deletions eng/Version.Details.props
View file
Open in desktop

Large diffs are not rendered by default.

388 changes: 194 additions & 194 deletions eng/Version.Details.xml
View file
Open in desktop

Large diffs are not rendered by default.

7 changes: 6 additions & 1 deletion eng/targets/CSharp.Common.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,12 @@
<_Parameter2>$(RepositoryUrl)/tree/$(SourceRevisionId)</_Parameter2>
</AssemblyAttribute>

<AssemblyAttribute Include="System.Reflection.AssemblyMetadataAttribute" Condition="'$(Serviceable)' == 'true'">
<AssemblyAttribute Include="System.Reflection.AssemblyMetadataAttribute" Condition="'$(RepoOriginalSourceRevisionId)' != ''">
<_Parameter1>OriginalRepoCommitHash</_Parameter1>
<_Parameter2>$(RepoOriginalSourceRevisionId)</_Parameter2>
</AssemblyAttribute>

<AssemblyAttribute Include="System.Reflection.AssemblyMetadataAttribute" Condition="'$(Serviceable)' == 'true'">
<_Parameter1>Serviceable</_Parameter1>
<_Parameter2>True</_Parameter2>
</AssemblyAttribute>
Expand Down
2 changes: 1 addition & 1 deletion eng/targets/Wix.Common.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<!-- Everything built in those projects _except_ the final package & MSI are shipping assets. -->
<_GeneratedPackageVersion>$(PackageVersion)</_GeneratedPackageVersion>
<_GeneratedPackageVersion
Condition="! $(PackageVersion.Contains('$(_PreReleaseLabel)'))">$(PackageVersion)-$(_PreReleaseLabel)$(_BuildNumberLabels)</_GeneratedPackageVersion>
Condition="! $(PackageVersion.Contains('$(_BuildNumberLabels)'))">$(VersionPrefix)-$(_PreReleaseLabel)$(_BuildNumberLabels)</_GeneratedPackageVersion>
<!-- Insert PackageVersion into OutputName for SharedFx & TargetingPack -->
<OutputName Condition="'$(OutputNamePrefix)' != '' AND '$(OutputNameSuffix)' != ''">$(OutputNamePrefix)$(_GeneratedPackageVersion)$(OutputNameSuffix)</OutputName>

Expand Down
17 changes: 7 additions & 10 deletions eng/testing/linker/SupportFiles/Directory.Build.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,8 @@
<Project>

<PropertyGroup>
<!-- Used to silence the warning caused by the workaround for https://github.com/dotnet/runtime/issues/81382 -->
<SuppressGenerateILCompilerExplicitPackageReferenceWarning>true</SuppressGenerateILCompilerExplicitPackageReferenceWarning>
</PropertyGroup>

<!-- needed to reference a specific version of NetCoreApp. Workaround https://github.com/dotnet/runtime/issues/81382 -->
<ItemGroup>
<FrameworkReference Update="Microsoft.NETCore.App"
RuntimeFrameworkVersion="$(MicrosoftNETCoreAppRefVersion)" />

<PackageReference Include="Microsoft.DotNet.ILCompiler"
Version="$(MicrosoftNETCoreAppRefVersion)" />

<!-- Workaround when there is no vNext SDK available; copy known packs info from 9.0. -->
<KnownAppHostPack Include="@(KnownAppHostPack->WithMetadataValue('TargetFramework', 'net9.0'))"
TargetFramework="$(TargetFramework)"
Expand Down Expand Up @@ -64,6 +54,13 @@
<AppHostRuntimeIdentifiers Condition=" '$(DotNetBuildSourceOnly)' == 'true' ">$(TargetRuntimeIdentifier)</AppHostRuntimeIdentifiers>
</KnownRuntimePack>

<KnownILCompilerPack Update="Microsoft.DotNet.ILCompiler">
<ILCompilerPackVersion>$(MicrosoftNETCoreAppRefVersion)</ILCompilerPackVersion>
</KnownILCompilerPack>

<KnownILLinkPack Update="Microsoft.NET.ILLink.Tasks">
<ILLinkPackVersion>$(MicrosoftNETCoreAppRefVersion)</ILLinkPackVersion>
</KnownILLinkPack>
</ItemGroup>

<!--
Expand Down
3 changes: 0 additions & 3 deletions eng/tools/GenerateFiles/Directory.Build.props.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,5 @@
<ArtifactsShippingPackagesDir>${ArtifactsShippingPackagesDir}</ArtifactsShippingPackagesDir>
<TreatWarningsAsErrors Condition="'$(BuildingInsideVisualStudio)' != 'true'">true</TreatWarningsAsErrors>
<LibNetHostAppPackVersion Condition=" '$(LibNetHostAppPackVersion)' == '' ">${LibNetHostAppPackVersion}</LibNetHostAppPackVersion>

<!-- Temporarily hardcoded to true -->
<SuppressGenerateILCompilerExplicitPackageReferenceWarning>true</SuppressGenerateILCompilerExplicitPackageReferenceWarning>
</PropertyGroup>
</Project>
9 changes: 5 additions & 4 deletions eng/tools/GenerateFiles/Directory.Build.targets.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,6 @@
Condition=" (('$(ProjectTargetFrameworkIdentifier)' == '${DefaultNetCoreTargetFramework}') AND '${DefaultNetCoreTargetFramework}' == '$(ProjectTargetFrameworkVersion)') AND '$(TargetLatestDotNetRuntime)' != 'false' "
RuntimeFrameworkVersion="${MicrosoftNETCoreAppRefVersion}"
TargetingPackVersion="${MicrosoftNETCoreAppRefVersion}" />

<PackageReference Include="Microsoft.DotNet.ILCompiler"
Condition=" '$(PublishAot)' == 'true' "
Version="${MicrosoftNETCoreAppRefVersion}" />
</ItemGroup>

<ItemGroup>
Expand Down Expand Up @@ -118,6 +114,11 @@
Condition=" '%(TargetFramework)' == '${DefaultNetCoreTargetFramework}' ">${MicrosoftNETCoreAppRefVersion}</ILLinkPackVersion>
</KnownILLinkPack>

<KnownILCompilerPack Update="Microsoft.DotNet.ILCompiler">
<ILCompilerPackVersion
Condition="'%(TargetFramework)' == '${DefaultNetCoreTargetFramework}'">$(MicrosoftNETCoreAppRefVersion)</ILCompilerPackVersion>
</KnownILCompilerPack>

<!-- Use the just-built ASP.NET Core shared framework if available except when building product code in servicing. -->
<KnownFrameworkReference Update="Microsoft.AspNetCore.App" Condition=" $(UpdateAspNetCoreKnownFramework) ">
<LatestRuntimeFrameworkVersion
Expand Down
10 changes: 5 additions & 5 deletions global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"sdk": {
"version": "10.0.100-preview.7.25322.101"
"version": "10.0.100-preview.7.25372.107"
},
"tools": {
"dotnet": "10.0.100-preview.7.25322.101",
"dotnet": "10.0.100-preview.7.25372.107",
"runtimes": {
"dotnet/x86": [
"$(MicrosoftInternalRuntimeAspNetCoreTransportVersion)"
Expand All @@ -27,9 +27,9 @@
"jdk": "latest"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25377.103",
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25377.103",
"Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25377.103",
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25406.102",
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25406.102",
"Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25406.102",
"Microsoft.Build.NoTargets": "3.7.0",
"Microsoft.Build.Traversal": "3.4.0"
}
Expand Down
Loading