Skip to content

Commit 55c8ed9

Browse files
[main] Update dependencies from dotnet/arcade (#5783)
[main] Update dependencies from dotnet/arcade - Update apicompat supression file
1 parent 70e593d commit 55c8ed9

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+1353
-428
lines changed

eng/Version.Details.xml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,21 @@
44
<ProductDependencies>
55
</ProductDependencies>
66
<ToolsetDependencies>
7-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.24626.1">
7+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25268.1">
88
<Uri>https://github.com/dotnet/arcade</Uri>
9-
<Sha>ae8d2a08f1021624ae37cdd5b65f6c05e58a051b</Sha>
9+
<Sha>35a34fa5ab9b2f97d3f7bdf48a7c2100727308b3</Sha>
1010
</Dependency>
11-
<Dependency Name="Microsoft.DotNet.GenFacades" Version="10.0.0-beta.24626.1">
11+
<Dependency Name="Microsoft.DotNet.GenFacades" Version="10.0.0-beta.25268.1">
1212
<Uri>https://github.com/dotnet/arcade</Uri>
13-
<Sha>ae8d2a08f1021624ae37cdd5b65f6c05e58a051b</Sha>
13+
<Sha>35a34fa5ab9b2f97d3f7bdf48a7c2100727308b3</Sha>
1414
</Dependency>
15-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.24626.1">
15+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.25268.1">
1616
<Uri>https://github.com/dotnet/arcade</Uri>
17-
<Sha>ae8d2a08f1021624ae37cdd5b65f6c05e58a051b</Sha>
17+
<Sha>35a34fa5ab9b2f97d3f7bdf48a7c2100727308b3</Sha>
1818
</Dependency>
19-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="10.0.0-beta.24626.1">
19+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="10.0.0-beta.25268.1">
2020
<Uri>https://github.com/dotnet/arcade</Uri>
21-
<Sha>ae8d2a08f1021624ae37cdd5b65f6c05e58a051b</Sha>
21+
<Sha>35a34fa5ab9b2f97d3f7bdf48a7c2100727308b3</Sha>
2222
</Dependency>
2323
</ToolsetDependencies>
2424
</Dependencies>

eng/Versions.props

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@
2020
</PropertyGroup>
2121
<!-- Arcade dependencies -->
2222
<PropertyGroup>
23-
<MicrosoftDotNetGenFacadesPackageVersion>10.0.0-beta.24626.1</MicrosoftDotNetGenFacadesPackageVersion>
24-
<MicrosoftDotNetXUnitExtensionsPackageVersion>10.0.0-beta.24626.1</MicrosoftDotNetXUnitExtensionsPackageVersion>
25-
<MicrosoftDotNetGenAPIPackageVersion>10.0.0-beta.24626.1</MicrosoftDotNetGenAPIPackageVersion>
23+
<MicrosoftDotNetGenFacadesPackageVersion>10.0.0-beta.25268.1</MicrosoftDotNetGenFacadesPackageVersion>
24+
<MicrosoftDotNetXUnitExtensionsPackageVersion>10.0.0-beta.25268.1</MicrosoftDotNetXUnitExtensionsPackageVersion>
25+
<MicrosoftDotNetGenAPIPackageVersion>10.0.0-beta.25268.1</MicrosoftDotNetGenAPIPackageVersion>
2626
</PropertyGroup>
2727
<!-- Additional dependencies -->
2828
<PropertyGroup>

eng/common/CIBuild.cmd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
@echo off
2-
powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0Build.ps1""" -restore -build -test -sign -pack -publish -ci %*"
2+
powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0Build.ps1""" -restore -build -test -sign -pack -publish -ci %*"

eng/common/build.ps1

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ Param(
77
[string] $msbuildEngine = $null,
88
[bool] $warnAsError = $true,
99
[bool] $nodeReuse = $true,
10+
[switch] $buildCheck = $false,
1011
[switch][Alias('r')]$restore,
1112
[switch] $deployDeps,
1213
[switch][Alias('b')]$build,
@@ -71,6 +72,8 @@ function Print-Usage() {
7172
Write-Host " -msbuildEngine <value> Msbuild engine to use to run build ('dotnet', 'vs', or unspecified)."
7273
Write-Host " -excludePrereleaseVS Set to exclude build engines in prerelease versions of Visual Studio"
7374
Write-Host " -nativeToolsOnMachine Sets the native tools on machine environment variable (indicating that the script should use native tools on machine)"
75+
Write-Host " -nodeReuse <value> Sets nodereuse msbuild parameter ('true' or 'false')"
76+
Write-Host " -buildCheck Sets /check msbuild parameter"
7477
Write-Host ""
7578

7679
Write-Host "Command line arguments not listed above are passed thru to msbuild."
@@ -97,6 +100,7 @@ function Build {
97100

98101
$bl = if ($binaryLog) { '/bl:' + (Join-Path $LogDir 'Build.binlog') } else { '' }
99102
$platformArg = if ($platform) { "/p:Platform=$platform" } else { '' }
103+
$check = if ($buildCheck) { '/check' } else { '' }
100104

101105
if ($projects) {
102106
# Re-assign properties to a new variable because PowerShell doesn't let us append properties directly for unclear reasons.
@@ -113,6 +117,7 @@ function Build {
113117
MSBuild $toolsetBuildProj `
114118
$bl `
115119
$platformArg `
120+
$check `
116121
/p:Configuration=$configuration `
117122
/p:RepoRoot=$RepoRoot `
118123
/p:Restore=$restore `
@@ -127,6 +132,7 @@ function Build {
127132
/p:PerformanceTest=$performanceTest `
128133
/p:Sign=$sign `
129134
/p:Publish=$publish `
135+
/p:RestoreStaticGraphEnableBinaryLogger=$binaryLog `
130136
@properties
131137
}
132138

eng/common/build.sh

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ usage()
4242
echo " --prepareMachine Prepare machine for CI run, clean up processes after build"
4343
echo " --nodeReuse <value> Sets nodereuse msbuild parameter ('true' or 'false')"
4444
echo " --warnAsError <value> Sets warnaserror msbuild parameter ('true' or 'false')"
45+
echo " --buildCheck <value> Sets /check msbuild parameter"
4546
echo ""
4647
echo "Command line arguments not listed above are passed thru to msbuild."
4748
echo "Arguments can also be passed in with a single hyphen."
@@ -76,6 +77,7 @@ clean=false
7677

7778
warn_as_error=true
7879
node_reuse=true
80+
build_check=false
7981
binary_log=false
8082
exclude_ci_binary_log=false
8183
pipelines_log=false
@@ -127,14 +129,14 @@ while [[ $# > 0 ]]; do
127129
-pack)
128130
pack=true
129131
;;
130-
-sourcebuild|-sb)
132+
-sourcebuild|-source-build|-sb)
131133
build=true
132134
source_build=true
133135
product_build=true
134136
restore=true
135137
pack=true
136138
;;
137-
-productBuild|-pb)
139+
-productbuild|-product-build|-pb)
138140
build=true
139141
product_build=true
140142
restore=true
@@ -173,6 +175,9 @@ while [[ $# > 0 ]]; do
173175
node_reuse=$2
174176
shift
175177
;;
178+
-buildcheck)
179+
build_check=true
180+
;;
176181
-runtimesourcefeed)
177182
runtime_source_feed=$2
178183
shift
@@ -224,8 +229,14 @@ function Build {
224229
bl="/bl:\"$log_dir/Build.binlog\""
225230
fi
226231

232+
local check=""
233+
if [[ "$build_check" == true ]]; then
234+
check="/check"
235+
fi
236+
227237
MSBuild $_InitializeToolset \
228238
$bl \
239+
$check \
229240
/p:Configuration=$configuration \
230241
/p:RepoRoot="$repo_root" \
231242
/p:Restore=$restore \
@@ -239,6 +250,7 @@ function Build {
239250
/p:PerformanceTest=$performance_test \
240251
/p:Sign=$sign \
241252
/p:Publish=$publish \
253+
/p:RestoreStaticGraphEnableBinaryLogger=$binary_log \
242254
$properties
243255

244256
ExitWithExitCode 0

eng/common/cibuild.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@ while [[ -h $source ]]; do
1313
done
1414
scriptroot="$( cd -P "$( dirname "$source" )" && pwd )"
1515

16-
. "$scriptroot/build.sh" --restore --build --test --pack --publish --ci $@
16+
. "$scriptroot/build.sh" --restore --build --test --pack --publish --ci $@

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

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ parameters:
2323
enablePublishBuildArtifacts: false
2424
enablePublishBuildAssets: false
2525
enablePublishTestResults: false
26-
enablePublishUsingPipelines: false
2726
enableBuildRetry: false
2827
mergeTestResults: false
2928
testRunTitle: ''
@@ -74,9 +73,6 @@ jobs:
7473
- ${{ if ne(parameters.enableTelemetry, 'false') }}:
7574
- name: DOTNET_CLI_TELEMETRY_PROFILE
7675
value: '$(Build.Repository.Uri)'
77-
- ${{ if eq(parameters.enableRichCodeNavigation, 'true') }}:
78-
- name: EnableRichCodeNavigation
79-
value: 'true'
8076
# Retry signature validation up to three times, waiting 2 seconds between attempts.
8177
# See https://learn.microsoft.com/en-us/nuget/reference/errors-and-warnings/nu3028#retry-untrusted-root-failures
8278
- name: NUGET_EXPERIMENTAL_CHAIN_BUILD_RETRY_POLICY
@@ -148,16 +144,6 @@ jobs:
148144
- ${{ each step in parameters.steps }}:
149145
- ${{ step }}
150146

151-
- ${{ if eq(parameters.enableRichCodeNavigation, true) }}:
152-
- task: RichCodeNavIndexer@0
153-
displayName: RichCodeNav Upload
154-
inputs:
155-
languages: ${{ coalesce(parameters.richCodeNavigationLanguage, 'csharp') }}
156-
environment: ${{ coalesce(parameters.richCodeNavigationEnvironment, 'internal') }}
157-
richNavLogOutputDirectory: $(Build.SourcesDirectory)/artifacts/bin
158-
uploadRichNavArtifacts: ${{ coalesce(parameters.richCodeNavigationUploadArtifacts, false) }}
159-
continueOnError: true
160-
161147
- ${{ each step in parameters.componentGovernanceSteps }}:
162148
- ${{ step }}
163149

eng/common/core-templates/job/publish-build-assets.yml

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,6 @@ parameters:
2020
# if 'true', the build won't run any of the internal only steps, even if it is running in non-public projects.
2121
runAsPublic: false
2222

23-
# Optional: whether the build's artifacts will be published using release pipelines or direct feed publishing
24-
publishUsingPipelines: false
25-
2623
# Optional: whether the build's artifacts will be published using release pipelines or direct feed publishing
2724
publishAssetsImmediately: false
2825

@@ -32,6 +29,9 @@ parameters:
3229

3330
is1ESPipeline: ''
3431

32+
# Optional: 🌤️ or not the build has assets it wants to publish to BAR
33+
isAssetlessBuild: false
34+
3535
jobs:
3636
- job: Asset_Registry_Publish
3737

@@ -75,15 +75,15 @@ jobs:
7575
- checkout: self
7676
fetchDepth: 3
7777
clean: true
78-
79-
- task: DownloadBuildArtifacts@0
80-
displayName: Download artifact
81-
inputs:
82-
artifactName: AssetManifests
83-
downloadPath: '$(Build.StagingDirectory)/Download'
84-
checkDownloadedFiles: true
85-
condition: ${{ parameters.condition }}
86-
continueOnError: ${{ parameters.continueOnError }}
78+
79+
- ${{ if eq(parameters.isAssetlessBuild, 'false') }}:
80+
- task: DownloadPipelineArtifact@2
81+
displayName: Download Asset Manifests
82+
inputs:
83+
artifactName: AssetManifests
84+
targetPath: '$(Build.StagingDirectory)/AssetManifests'
85+
condition: ${{ parameters.condition }}
86+
continueOnError: ${{ parameters.continueOnError }}
8787

8888
- task: NuGetAuthenticate@1
8989

@@ -95,9 +95,9 @@ jobs:
9595
scriptLocation: scriptPath
9696
scriptPath: $(Build.SourcesDirectory)/eng/common/sdk-task.ps1
9797
arguments: -task PublishBuildAssets -restore -msbuildEngine dotnet
98-
/p:ManifestsPath='$(Build.StagingDirectory)/Download/AssetManifests'
98+
/p:ManifestsPath='$(Build.StagingDirectory)/AssetManifests'
99+
/p:IsAssetlessBuild=${{ parameters.isAssetlessBuild }}
99100
/p:MaestroApiEndpoint=https://maestro.dot.net
100-
/p:PublishUsingPipelines=${{ parameters.publishUsingPipelines }}
101101
/p:OfficialBuildId=$(Build.BuildNumber)
102102
condition: ${{ parameters.condition }}
103103
continueOnError: ${{ parameters.continueOnError }}
@@ -129,7 +129,7 @@ jobs:
129129
publishLocation: Container
130130
artifactName: ReleaseConfigs
131131

132-
- ${{ if eq(parameters.publishAssetsImmediately, 'true') }}:
132+
- ${{ if or(eq(parameters.publishAssetsImmediately, 'true'), eq(parameters.isAssetlessBuild, 'true')) }}:
133133
- template: /eng/common/core-templates/post-build/setup-maestro-vars.yml
134134
parameters:
135135
BARBuildId: ${{ parameters.BARBuildId }}
@@ -150,6 +150,7 @@ jobs:
150150
-WaitPublishingFinish true
151151
-ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}'
152152
-SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}'
153+
-SkipAssetsPublishing '${{ parameters.isAssetlessBuild }}'
153154
154155
- ${{ if eq(parameters.enablePublishBuildArtifacts, 'true') }}:
155156
- template: /eng/common/core-templates/steps/publish-logs.yml

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ jobs:
1515
enablePublishBuildArtifacts: false
1616
enablePublishTestResults: false
1717
enablePublishBuildAssets: false
18-
enablePublishUsingPipelines: false
1918
enableTelemetry: true
2019

2120
variables:

0 commit comments

Comments
 (0)