Skip to content

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

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.

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 4 commits into from
Apr 24, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .vsts.pipelines/builds/ci-public.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ stages:
displayName: Source-Build (Managed)
pool:
name: $(DncEngPublicBuildPool)
demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open
demands: ImageOverride -equals Build.Ubuntu.2204.Amd64.Open
container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream8'
workspace:
clean: all
Expand Down
7 changes: 4 additions & 3 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Dependencies>
<Source Uri="https://github.com/dotnet/dotnet" Mapping="source-build-externals" Sha="721dc7a2a59416b21fc49447d264009d708d6000" BarId="265489" />
<ToolsetDependencies>
<Dependency Name="Microsoft.Build" Version="17.14.0-preview-24619-01">
<Uri>https://github.com/dotnet/msbuild</Uri>
Expand All @@ -11,9 +12,9 @@
<Sha>e9b99f554a3c298e1106ea171f5a0462780af2c5</Sha>
<SourceBuild RepoName="msbuild" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25222.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>80d7b4ee29c31c0886b139ad02d85da48b543cd6</Sha>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25223.119">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>721dc7a2a59416b21fc49447d264009d708d6000</Sha>
</Dependency>
<!-- Intermediate is necessary for source build. -->
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="10.0.0-beta.25222.2">
Expand Down
Empty file modified eng/common/SetupNugetSources.sh
100644 → 100755
Empty file.
4 changes: 2 additions & 2 deletions eng/common/core-templates/jobs/jobs.yml
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
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
Empty file.
Empty file modified eng/common/cross/tizen-build-rootfs.sh
100644 → 100755
Empty file.
Empty file modified eng/common/cross/tizen-fetch.sh
100644 → 100755
Empty file.
Empty file modified eng/common/generate-sbom-prep.sh
100644 → 100755
Empty file.
Empty file modified eng/common/native/install-dependencies.sh
100644 → 100755
Empty file.
Empty file modified eng/common/sdk-task.sh
100644 → 100755
Empty file.
2 changes: 1 addition & 1 deletion global.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
"dotnet": "10.0.100-preview.3.25201.16"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25222.2"
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25223.119"
}
}