Skip to content

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

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 3 commits into from
Apr 24, 2025
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6e862fe
Merging main into darc-main-db56c806-e5ae-4e03-b8ed-84f20a94003a
dotnet-maestro[bot] Apr 24, 2025
8780b45
Update dependencies from https://github.com/dotnet/dotnet
dotnet-maestro[bot] Apr 24, 2025
1f2c0af
Add comment about roslyn manual updates
akoeplinger Apr 24, 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
541 changes: 271 additions & 270 deletions eng/Version.Details.xml
View file
Open in desktop

Large diffs are not rendered by default.

175 changes: 88 additions & 87 deletions eng/Versions.props
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions eng/common/core-templates/jobs/jobs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ jobs:
${{ parameter.key }}: ${{ parameter.value }}

- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
- ${{ if or(eq(parameters.enablePublishBuildAssets, true), eq(parameters.artifacts.publish.manifests, 'true'), ne(parameters.artifacts.publish.manifests, ''), eq(parameters.isAssetlessBuild, true)) }}:
- ${{ if or(eq(parameters.enablePublishBuildAssets, true), eq(parameters.artifacts.publish.manifests, 'true'), ne(parameters.artifacts.publish.manifests, '')) }}:
- template: ../job/publish-build-assets.yml
parameters:
is1ESPipeline: ${{ parameters.is1ESPipeline }}
Expand All @@ -112,7 +112,7 @@ jobs:
- Source_Build_Complete

runAsPublic: ${{ parameters.runAsPublic }}
publishAssetsImmediately: ${{ or(parameters.publishAssetsImmediately, parameters.isAssetlessBuild) }}
publishAssetsImmediately: ${{ parameters.publishAssetsImmediately }}
isAssetlessBuild: ${{ parameters.isAssetlessBuild }}
enablePublishBuildArtifacts: ${{ parameters.enablePublishBuildArtifacts }}
artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
Expand Down
4 changes: 3 additions & 1 deletion 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 @@ -93,7 +93,9 @@ steps:
$portableBuildArgs \
/p:DotNetBuildSourceOnly=true \
/p:DotNetBuildRepo=true \
/p:AssetManifestFileName=$assetManifestFileName
/p:AssetManifestFileName=$assetManifestFileName \
/p:SetUpSourceBuildIntermediateNupkgCache=false \
/p:ReportPrebuiltUsage=false
displayName: Build

# Upload build logs for diagnosis.
Expand Down
Empty file modified eng/common/cross/install-debs.py
100644 → 100755
View file
Open in desktop
Empty file.
Empty file modified eng/common/cross/tizen-build-rootfs.sh
100644 → 100755
View file
Open in desktop
Empty file.
Empty file modified eng/common/cross/tizen-fetch.sh
100644 → 100755
View file
Open in desktop
Empty file.
Empty file modified eng/common/generate-sbom-prep.sh
100644 → 100755
View file
Open in desktop
Empty file.
Empty file modified eng/common/native/install-dependencies.sh
100644 → 100755
View file
Open in desktop
Empty file.
Empty file modified eng/common/sdk-task.sh
100644 → 100755
View file
Open in desktop
Empty file.
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.25223.1",
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25223.1",
"Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25223.1",
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25223.119",
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25223.119",
"Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25223.119",
"Microsoft.Build.NoTargets": "3.7.0",
"Microsoft.Build.Traversal": "3.4.0"
}
Expand Down
Loading