Skip to content

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

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

Merged
merged 12 commits into from
Jul 17, 2025
Merged

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

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
aa7b6de
Update dependencies from https://github.com/dotnet/dotnet build 274568
dotnet-maestro[bot] Jul 10, 2025
99f1edd
Update dependencies from https://github.com/dotnet/dotnet build 274788
dotnet-maestro[bot] Jul 11, 2025
a157501
Merge branch 'main' into darc-main-f6a8d6f9-f17e-4a00-b652-27f886c87b1f
BrennanConroy Jul 16, 2025
720df85
[VMR] Codeflow f905beb-f905beb
dotnet-maestro[bot] Jul 16, 2025
4a4364e
Update dependencies from https://github.com/dotnet/dotnet build 275313
dotnet-maestro[bot] Jul 16, 2025
8f8a7b4
Revert version changes to hybridcache and msbuild packages
akoeplinger Jul 16, 2025
648171a
Bump XUnitRunnerVisualStudioVersion to 3.1.3
akoeplinger Jul 16, 2025
ec1cd00
[VMR] Codeflow 9d4270c-9d4270c
dotnet-maestro[bot] Jul 17, 2025
e09a83c
Merge main into darc-main-f6a8d6f9-f17e-4a00-b652-27f886c87b1f
dotnet-maestro[bot] Jul 17, 2025
ff95f2d
Update dependencies from https://github.com/dotnet/dotnet build 275513
dotnet-maestro[bot] Jul 17, 2025
1fb6d09
Revert msbuild again and move properties to the correct sections in V…
akoeplinger Jul 17, 2025
3e47dcc
Skip manually updated versions in CodeCheck.ps1
akoeplinger Jul 17, 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
394 changes: 199 additions & 195 deletions eng/Version.Details.xml
View file
Open in desktop

Large diffs are not rendered by default.

185 changes: 93 additions & 92 deletions eng/Versions.props
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@
"jdk": "latest"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25358.102",
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25358.102",
"Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25358.102",
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25365.101",
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25365.101",
"Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25365.101",
"Microsoft.Build.NoTargets": "3.7.0",
"Microsoft.Build.Traversal": "3.4.0"
}
Expand Down
1 change: 1 addition & 0 deletions src/Framework/App.Ref/src/Microsoft.AspNetCore.App.Ref.sfxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
<GenerateInstallers Condition="'$(DotNetBuildSourceOnly)' != 'true'">true</GenerateInstallers>
<BuildDebPackage Condition="'$(RuntimeIdentifier)' == 'linux-x64' or '$(RuntimeIdentifier)' == 'linux-arm64'">true</BuildDebPackage>
<BuildRpmPackage Condition="'$(RuntimeIdentifier)' == 'linux-x64' or '$(RuntimeIdentifier)' == 'linux-arm64'">true</BuildRpmPackage>
<UseArcadeRpmTooling>true</UseArcadeRpmTooling>
<GenerateVSInsertionPackages>true</GenerateVSInsertionPackages>
</PropertyGroup>

Expand Down
11 changes: 10 additions & 1 deletion src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.Composite.sfxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,8 @@

<NativeRuntimeAsset Condition=" '$(UseIisNativeAssets)' == 'true' AND !$(BuildNative) "
Include="$(ArtifactsBinDir)InProcessRequestHandler\$(NativePlatform)\$(Configuration)\aspnetcorev2_inprocess.dll" />
<NativeRuntimeAsset Condition=" '$(UseIisNativeAssets)' == 'true' AND !$(BuildNative) "
<!-- Always explicitly include the .pdb -->
<NativeRuntimeAsset Condition=" '$(UseIisNativeAssets)' == 'true' "
Include="$(ArtifactsBinDir)InProcessRequestHandler\$(NativePlatform)\$(Configuration)\aspnetcorev2_inprocess.pdb" />
</ItemGroup>

Expand All @@ -118,6 +119,14 @@
<_TransportPdbs Include="$(PkgMicrosoft_Internal_Runtime_AspNetCore_Transport)\**\*.pdb"
Exclude="$(PkgMicrosoft_Internal_Runtime_AspNetCore_Transport)\**\*.ni.pdb" />

<!-- Dedupe System.Security.Cryptography.Pkcs.pdb based on RID -->
<!-- If we get rid of our custom reference resolution here, we can let nuget handle this -->
<_TransportPdbs Remove="$(PkgMicrosoft_Internal_Runtime_AspNetCore_Transport)\lib\**\System.Security.Cryptography.Pkcs.pdb"
Condition="'$(TargetOsName)' == 'win'" />

<_TransportPdbs Remove="$(PkgMicrosoft_Internal_Runtime_AspNetCore_Transport)\runtimes\win\**\System.Security.Cryptography.Pkcs.pdb"
Condition="'$(TargetOsName)' != 'win'" />

<_SymbolFilesToPackage Include="@(_TransportPdbs)"
Condition="'$(FileNameList)' != '' and $(FileNameList.Contains('%(Filename);'))" />
</ItemGroup>
Expand Down
12 changes: 11 additions & 1 deletion src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.sfxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
<GenerateInstallers Condition="'$(DotNetBuildSourceOnly)' != 'true'">true</GenerateInstallers>
<BuildDebPackage Condition="'$(RuntimeIdentifier)' == 'linux-x64' or '$(RuntimeIdentifier)' == 'linux-arm64'">true</BuildDebPackage>
<BuildRpmPackage Condition="'$(RuntimeIdentifier)' == 'linux-x64' or '$(RuntimeIdentifier)' == 'linux-arm64'">true</BuildRpmPackage>
<UseArcadeRpmTooling>true</UseArcadeRpmTooling>
<GenerateVSInsertionPackages>true</GenerateVSInsertionPackages>
</PropertyGroup>

Expand Down Expand Up @@ -97,7 +98,8 @@

<NativeRuntimeAsset Condition=" '$(UseIisNativeAssets)' == 'true' AND !$(BuildNative) "
Include="$(ArtifactsBinDir)InProcessRequestHandler\$(NativePlatform)\$(Configuration)\aspnetcorev2_inprocess.dll" />
<NativeRuntimeAsset Condition=" '$(UseIisNativeAssets)' == 'true' AND !$(BuildNative) "
<!-- Always explicitly include the .pdb -->
<NativeRuntimeAsset Condition=" '$(UseIisNativeAssets)' == 'true' "
Include="$(ArtifactsBinDir)InProcessRequestHandler\$(NativePlatform)\$(Configuration)\aspnetcorev2_inprocess.pdb" />
</ItemGroup>

Expand All @@ -114,6 +116,14 @@
<_TransportPdbs Include="$(PkgMicrosoft_Internal_Runtime_AspNetCore_Transport)\**\*.pdb"
Exclude="$(PkgMicrosoft_Internal_Runtime_AspNetCore_Transport)\**\*.ni.pdb" />

<!-- Dedupe System.Security.Cryptography.Pkcs.pdb based on RID -->
<!-- If we get rid of our custom reference resolution here, we can let nuget handle this -->
<_TransportPdbs Remove="$(PkgMicrosoft_Internal_Runtime_AspNetCore_Transport)\lib\**\System.Security.Cryptography.Pkcs.pdb"
Condition="'$(TargetOsName)' == 'win'" />

<_TransportPdbs Remove="$(PkgMicrosoft_Internal_Runtime_AspNetCore_Transport)\runtimes\win\**\System.Security.Cryptography.Pkcs.pdb"
Condition="'$(TargetOsName)' != 'win'" />

<_SymbolFilesToPackage Include="@(_TransportPdbs)"
Condition="'$(FileNameList)' != '' and $(FileNameList.Contains('%(Filename);'))" />
</ItemGroup>
Expand Down
Loading