Skip to content

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

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 11 commits into from
May 22, 2025
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
8fa8107
[VMR] Codeflow e26a16c-e26a16c
dotnet-maestro[bot] May 20, 2025
913a52c
Merging main into darc-main-85a65ee4-bc43-4d9a-9b5c-beffc2bf862a
dotnet-maestro[bot] May 20, 2025
afc0577
Update dependencies from https://github.com/dotnet/dotnet build 268973
dotnet-maestro[bot] May 20, 2025
ce921d3
Align M.CA package versions
mthalman May 21, 2025
2ae6e82
Merging main into darc-main-85a65ee4-bc43-4d9a-9b5c-beffc2bf862a
dotnet-maestro[bot] May 22, 2025
11107f8
Update dependencies from https://github.com/dotnet/dotnet build 269082
dotnet-maestro[bot] May 22, 2025
1d3d3de
Add System.Threading.AccessControl to expected assemblies
akoeplinger May 22, 2025
3c695d2
Adjust expected exit code in ShutdownTests.cs
akoeplinger May 22, 2025
1194316
Fix method name, kill by default sends TERM not INT
akoeplinger May 22, 2025
d42c835
Revert "Adjust expected exit code in ShutdownTests.cs"
jkotas May 22, 2025
97ebf48
React to https://github.com/dotnet/runtime/pull/115494
jkotas May 22, 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
8 changes: 4 additions & 4 deletions eng/Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,14 +56,14 @@
$(RepoRoot)src\SignalR\perf\benchmarkapps\**\*.csproj;
" />

<!-- In the VMR, we don't build the native ANCM bits in pass 1 -->
<!-- In the .NET product build mode, don't build the native ANCM bits in pass 1 -->
<ProjectToExclude Include="
$(RepoRoot)src\Installers\**\*.vcxproj;
"
Condition=" '$(BuildNative)' == 'true' and '$(DotNetBuild)' == 'true' and ('$(DotNetBuildPass)' == '' or '$(DotNetBuildPass)' == '1') " />


<!-- This project requires inputs from x64, x86, and arm64 on Windows - therefore in the VMR, we build it in pass 2 -->
<!-- This project requires inputs from x64, x86, and arm64 on Windows - therefore in the .NET product build mode, build it in pass 2 -->
<ProjectToExclude Include="
$(RepoRoot)src\Servers\IIS/IntegrationTesting.IIS\src\Microsoft.AspNetCore.Server.IntegrationTesting.IIS.csproj;
"
Expand All @@ -83,7 +83,7 @@
</ProjectToBuild>
</ItemGroup>
</When>
<!-- Projects to build in VMR build pass 2 -->
<!-- Projects to build in .NET product build pass 2 -->
<When Condition="'$(DotNetBuildPass)' == '2'">
<ItemGroup Condition=" '$(DotNetBuild)' == 'true' AND '$(TargetOsName)' == 'win' AND '$(TargetArchitecture)' == 'x64' ">
<!-- Build Hosting Bundle -->
Expand Down Expand Up @@ -264,7 +264,7 @@
<_VcxTargetPlatform Condition="'$(TargetArchitecture)' == 'arm64'">ARM64</_VcxTargetPlatform>
</PropertyGroup>

<!-- In the VMR, we build the installers entirely via HostingBundle ProjectReferences in pass 2 -->
<!-- In .NET product build mode, build the installers entirely via HostingBundle ProjectReferences in pass 2 -->
<ItemGroup Condition="'$(DotNetBuild)' != 'true' and '$(_BuildWindowsInstallers)' == 'true' ">
<!-- Build the ANCM custom action -->
<InstallerProject Include="$(RepoRoot)src\Installers\Windows\AspNetCoreModule-Setup\CustomAction\aspnetcoreCA.vcxproj" AdditionalProperties="Platform=x64" />
Expand Down
2 changes: 1 addition & 1 deletion eng/Common.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

<TargetRuntimeIdentifier Condition="'$(TargetRuntimeIdentifier)' == ''">$(TargetOsName)-$(TargetArchitecture)</TargetRuntimeIdentifier>
<PortableBuild Condition="'$(PortableBuild)' == ''">true</PortableBuild>
<DefaultAppHostRuntimeIdentifier Condition=" '$(DotNetBuild)' == 'true' ">$(TargetRuntimeIdentifier)</DefaultAppHostRuntimeIdentifier>
<DefaultAppHostRuntimeIdentifier Condition="'$(DotNetBuild)' == 'true'">$(TargetRuntimeIdentifier)</DefaultAppHostRuntimeIdentifier>

<BuildNodeJS>$(BuildNodeJSUnlessSourcebuild)</BuildNodeJS>
<BuildNodeJS Condition="'$(DotNetBuildSourceOnly)' == 'true'">false</BuildNodeJS>
Expand Down
19 changes: 19 additions & 0 deletions eng/Dependencies.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,4 +258,23 @@ and are generated based on the last package release.
Condition=" $([System.String]::new('%(Identity)').StartsWith('Microsoft.NETCore.App.Runtime.')) or $([System.String]::new('%(Identity)').StartsWith('Microsoft.NETCore.App.Crossgen2.'))">$(MicrosoftNETCoreAppRefVersion)</Version>
</LatestPackageReference>
</ItemGroup>

<!-- Replicates the same overriding of versions that occurs on Roslyn package versions for source only builds -->
<ItemGroup Label="Source only build overrides" Condition="'$(DotNetBuildSourceOnly)' == 'true'">
<LatestPackageReference Update="Microsoft.CodeAnalysis.Common">
<Version>$(MicrosoftCodeAnalysisVersion_LatestVS)</Version>
</LatestPackageReference>
<LatestPackageReference Update="Microsoft.CodeAnalysis.CSharp">
<Version>$(MicrosoftCodeAnalysisVersion_LatestVS)</Version>
</LatestPackageReference>
<LatestPackageReference Update="Microsoft.CodeAnalysis.CSharp.Workspaces">
<Version>$(MicrosoftCodeAnalysisVersion_LatestVS)</Version>
</LatestPackageReference>
<LatestPackageReference Update="Microsoft.CodeAnalysis.ExternalAccess.AspNetCore">
<Version>$(MicrosoftCodeAnalysisVersion_LatestVS)</Version>
</LatestPackageReference>
<LatestPackageReference Update="Microsoft.CodeAnalysis.Razor">
<Version>$(MicrosoftCodeAnalysisVersion_LatestVS)</Version>
</LatestPackageReference>
</ItemGroup>
</Project>
11 changes: 5 additions & 6 deletions eng/Publishing.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
<Project>

<PropertyGroup>
<ProducesDotNetReleaseShippingAssets>true</ProducesDotNetReleaseShippingAssets>

<!-- Do not push .nupkg files from Linux and macOS builds. They'll be packed up separately and signed on Windows.
Do not remove if post build sign is true, as we avoid the xplat codesign jobs, and need to have
the nupkgs pushed. Do not do this if building from source, since we want the source build intermediate package
to be published. Use DotNetBuildRepo is only set in the internal source build,
and Build.proj is invoked from the wrapper build. -->
<!-- Don't sign and publish rid agnostic nuget packages from other builds than windows when not building
inside the VMR. Do not remove if post build sign is true, as we avoid the xplat codesign jobs, and need to have
the nupkgs pushed. -->
<EnableDefaultArtifacts Condition="'$(OS)' != 'Windows_NT' and
'$(PostBuildSign)' != 'true' and
'$(DotNetBuildRepo)' != 'true'">false</EnableDefaultArtifacts>
'$(DotNetBuild)' != 'true'">false</EnableDefaultArtifacts>

<!-- This avoids creating VS.*.symbols.nupkg packages that are identical to the original package. -->
<AutoGenerateSymbolPackages>false</AutoGenerateSymbolPackages>
Expand Down
1 change: 1 addition & 0 deletions eng/SharedFramework.External.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@
<ExternalAspNetCoreAppReference Include="Microsoft.Extensions.Options" Version="$(MicrosoftExtensionsOptionsVersion)" />
<ExternalAspNetCoreAppReference Include="Microsoft.Extensions.Primitives" Version="$(MicrosoftExtensionsPrimitivesVersion)" />
<ExternalAspNetCoreAppReference Include="System.Security.Cryptography.Xml" Version="$(SystemSecurityCryptographyXmlVersion)" />
<ExternalAspNetCoreAppReference Include="System.Threading.AccessControl" Version="$(SystemThreadingAccessControlVersion)" />
<ExternalAspNetCoreAppReference Include="System.Threading.RateLimiting" Version="$(SystemThreadingRateLimitingVersion)" />

<!--
Expand Down
Loading
Loading