Skip to content

Commit 095f11c

Browse files
authored
[main] Source code updates from dotnet/dotnet (#48711)
2 parents d69c7b7 + a41f569 commit 095f11c

File tree

6 files changed

+370
-369
lines changed

6 files changed

+370
-369
lines changed

eng/Version.Details.xml

Lines changed: 243 additions & 243 deletions
Large diffs are not rendered by default.

eng/Versions.props

Lines changed: 119 additions & 119 deletions
Large diffs are not rendered by default.

eng/common/core-templates/job/source-build.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@ parameters:
2727
# Specifies the build script to invoke to perform the build in the repo. The default
2828
# './build.sh' should work for typical Arcade repositories, but this is customizable for
2929
# difficult situations.
30+
# buildArguments: ''
31+
# Specifies additional build arguments to pass to the build script.
3032
# jobProperties: {}
3133
# A list of job properties to inject at the top level, for potential extensibility beyond
3234
# container and pool.

eng/common/core-templates/jobs/jobs.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ jobs:
9696
${{ parameter.key }}: ${{ parameter.value }}
9797

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

114114
runAsPublic: ${{ parameters.runAsPublic }}
115-
publishAssetsImmediately: ${{ parameters.publishAssetsImmediately }}
115+
publishAssetsImmediately: ${{ or(parameters.publishAssetsImmediately, parameters.isAssetlessBuild) }}
116116
isAssetlessBuild: ${{ parameters.isAssetlessBuild }}
117117
enablePublishBuildArtifacts: ${{ parameters.enablePublishBuildArtifacts }}
118118
artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}

eng/common/core-templates/steps/source-build.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@ steps:
8484
${{ coalesce(parameters.platform.buildScript, './build.sh') }} --ci \
8585
--configuration $buildConfig \
8686
--restore --build --pack $publishArgs -bl \
87+
${{ parameters.platform.buildArguments }} \
8788
$officialBuildArgs \
8889
$internalRuntimeDownloadArgs \
8990
$internalRestoreArgs \
@@ -93,9 +94,7 @@ steps:
9394
$portableBuildArgs \
9495
/p:DotNetBuildSourceOnly=true \
9596
/p:DotNetBuildRepo=true \
96-
/p:AssetManifestFileName=$assetManifestFileName \
97-
/p:SetUpSourceBuildIntermediateNupkgCache=false \
98-
/p:ReportPrebuiltUsage=false
97+
/p:AssetManifestFileName=$assetManifestFileName
9998
displayName: Build
10099

101100
# Upload build logs for diagnosis.

global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
}
1515
},
1616
"msbuild-sdks": {
17-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25223.119",
18-
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25223.119",
17+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25225.102",
18+
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25225.102",
1919
"Microsoft.Build.NoTargets": "3.7.0",
2020
"Microsoft.Build.Traversal": "3.4.0"
2121
}

0 commit comments

Comments
 (0)