Skip to content

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

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 10 commits into
base: main
Choose a base branch
from
+348 −354
Open

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
601c741
Merging main into darc-main-9c426504-cf32-4925-b1a9-d5d072fa1d05
dotnet-maestro[bot] Jun 18, 2025
cd976d7
Update dependencies from https://github.com/dotnet/dotnet build 272212
dotnet-maestro[bot] Jun 18, 2025
2fe81c5
Update dependencies from https://github.com/dotnet/dotnet build 272322
dotnet-maestro[bot] Jun 19, 2025
dc20d22
Merge branch 'main' of https://github.com/dotnet/SDK into darc-main-9…
Jun 19, 2025
d730d9a
[VMR] Codeflow 9bcfe61-2fe81c5
dotnet-maestro[bot] Jun 20, 2025
7c15682
Update dependencies from https://github.com/dotnet/dotnet build 272389
dotnet-maestro[bot] Jun 20, 2025
559565b
[VMR] Codeflow 0e9898b-0e9898b
dotnet-maestro[bot] Jun 21, 2025
e7fdc87
Merging main into darc-main-9c426504-cf32-4925-b1a9-d5d072fa1d05
dotnet-maestro[bot] Jun 21, 2025
1108091
Update dependencies from https://github.com/dotnet/dotnet build 272596
dotnet-maestro[bot] Jun 21, 2025
18b8f38
Update dependencies from https://github.com/dotnet/dotnet build 272656
dotnet-maestro[bot] Jun 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
1 change: 1 addition & 0 deletions Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
<HostOSName Condition="'$(HostOSName)' == '' AND $([MSBuild]::IsOSPlatform('ILLUMOS'))">illumos</HostOSName>
<HostOSName Condition="'$(HostOSName)' == '' AND '$(IsLinux)' == 'true'">linux</HostOSName>

<OSName Condition="'$(OSName)' == '' AND $(PortableTargetRid) != ''">$(PortableTargetRid.Substring(0, $(PortableTargetRid.LastIndexOf('-'))))</OSName>
<OSName Condition="'$(OSName)' == '' AND $(TargetRid) != ''">$(TargetRid.Substring(0, $(TargetRid.LastIndexOf('-'))))</OSName>
<OSName Condition="'$(OSName)' == ''">$(HostOSName)</OSName>
</PropertyGroup>
Expand Down
458 changes: 229 additions & 229 deletions eng/Version.Details.xml
View file
Open in desktop

Large diffs are not rendered by default.

224 changes: 112 additions & 112 deletions eng/Versions.props
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 0 additions & 6 deletions eng/common/core-templates/steps/source-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,6 @@ steps:
targetRidArgs='/p:TargetRid=${{ parameters.platform.targetRID }}'
fi

baseRidArgs=
if [ '${{ parameters.platform.baseRID }}' != '' ]; then
baseRidArgs='/p:BaseRid=${{ parameters.platform.baseRID }}'
fi

portableBuildArgs=
if [ '${{ parameters.platform.portableBuild }}' != '' ]; then
portableBuildArgs='/p:PortableBuild=${{ parameters.platform.portableBuild }}'
Expand All @@ -55,7 +50,6 @@ steps:
${{ parameters.platform.buildArguments }} \
$internalRuntimeDownloadArgs \
$targetRidArgs \
$baseRidArgs \
$portableBuildArgs \
displayName: Build

Expand Down
6 changes: 3 additions & 3 deletions global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"tools": {
"dotnet": "10.0.100-preview.6.25302.104",
"dotnet": "10.0.100-preview.6.25315.102",
"runtimes": {
"dotnet": [
"$(MicrosoftNETCorePlatformsPackageVersion)"
Expand All @@ -14,8 +14,8 @@
}
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25316.103",
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25316.103",
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25320.118",
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25320.118",
"Microsoft.Build.NoTargets": "3.7.0",
"Microsoft.Build.Traversal": "3.4.0"
}
Expand Down
5 changes: 2 additions & 3 deletions src/Layout/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,8 @@
<TargetRid Condition="'$(TargetRid)' == ''">$(OSName)-$(TargetArchitecture)</TargetRid>
<ProductMonikerRid>$(TargetRid)</ProductMonikerRid>

<PortableOSName Condition="'$(PortableOSName)' == ''">$(OSName)</PortableOSName>
<PortableRid>$(PortableOSName)-$(TargetArchitecture)</PortableRid>
<PortableProductMonikerRid>$(PortableRid)</PortableProductMonikerRid>
<PortableTargetRid Condition="'$(PortableTargetRid)' == ''">$(OSName)-$(TargetArchitecture)</PortableTargetRid>
<PortableProductMonikerRid>$(PortableTargetRid)</PortableProductMonikerRid>
</PropertyGroup>

<PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/Layout/redist/targets/GenerateBundledVersions.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -398,7 +398,7 @@
win-x86;
" />

<!-- ILCompiler target RIDs that are officially supported, plus the architecture we are building the product for (OutputRID). See:
<!-- ILCompiler target RIDs that are officially supported, plus the architecture we are building the product for (TargetRid). See:
https://github.com/dotnet/runtime/blob/main/src/installer/pkg/projects/Microsoft.DotNet.ILCompiler/ILCompilerRIDs.props -->
<ILCompilerSupportedRids Include="
@(Net90ILCompilerSupportedRids);
Expand Down
Loading