Skip to content

Commit 3149501

Browse files
[main] Source code updates from dotnet/dotnet (#48822)
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1 parent 67f43d9 commit 3149501

File tree

6 files changed

+366
-392
lines changed

6 files changed

+366
-392
lines changed

eng/DotNetBuild.props

Lines changed: 0 additions & 9 deletions
This file was deleted.

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/jobs/source-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ parameters:
1414
# This is the default platform provided by Arcade, intended for use by a managed-only repo.
1515
defaultManagedPlatform:
1616
name: 'Managed'
17-
container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream9'
17+
container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream-10-amd64'
1818

1919
# Defines the platforms on which to run build jobs. One job is created for each platform, and the
2020
# object in this array is sent to the job template as 'platform'. If no platforms are specified,

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

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,6 @@ steps:
4646
buildConfig='$(_BuildConfig)'
4747
fi
4848
49-
officialBuildArgs=
50-
if [ '${{ and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}' = 'True' ]; then
51-
officialBuildArgs='/p:DotNetPublishUsingPipelines=true /p:OfficialBuildId=$(BUILD.BUILDNUMBER)'
52-
fi
53-
5449
targetRidArgs=
5550
if [ '${{ parameters.platform.targetRID }}' != '' ]; then
5651
targetRidArgs='/p:TargetRid=${{ parameters.platform.targetRID }}'
@@ -66,26 +61,15 @@ steps:
6661
baseOsArgs='/p:BaseOS=${{ parameters.platform.baseOS }}'
6762
fi
6863
69-
publishArgs=
70-
if [ '${{ parameters.platform.skipPublishValidation }}' != 'true' ]; then
71-
publishArgs='--publish'
72-
fi
73-
74-
assetManifestFileName=SourceBuild_RidSpecific.xml
75-
if [ '${{ parameters.platform.name }}' != '' ]; then
76-
assetManifestFileName=SourceBuild_${{ parameters.platform.name }}.xml
77-
fi
78-
7964
portableBuildArgs=
8065
if [ '${{ parameters.platform.portableBuild }}' != '' ]; then
8166
portableBuildArgs='/p:PortableBuild=${{ parameters.platform.portableBuild }}'
8267
fi
8368
8469
${{ coalesce(parameters.platform.buildScript, './build.sh') }} --ci \
8570
--configuration $buildConfig \
86-
--restore --build --pack $publishArgs -bl \
71+
--restore --build --pack -bl \
8772
${{ parameters.platform.buildArguments }} \
88-
$officialBuildArgs \
8973
$internalRuntimeDownloadArgs \
9074
$internalRestoreArgs \
9175
$targetRidArgs \
@@ -94,7 +78,6 @@ steps:
9478
$portableBuildArgs \
9579
/p:DotNetBuildSourceOnly=true \
9680
/p:DotNetBuildRepo=true \
97-
/p:AssetManifestFileName=$assetManifestFileName
9881
displayName: Build
9982

10083
# 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.25230.108",
18-
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25230.108",
17+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25252.107",
18+
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25252.107",
1919
"Microsoft.Build.NoTargets": "3.7.0",
2020
"Microsoft.Build.Traversal": "3.4.0"
2121
}

0 commit comments

Comments
 (0)