Skip to content
This repository was archived by the owner on Jan 23, 2023. It is now read-only.

Commit 7584f64

Browse files
dotnet-maestro[bot]Anipik
dotnet-maestro[bot]
authored and
Anipik
committed
[release/3.0] Update dependencies from dotnet/arcade (#26205)
* Update dependencies from https://github.com/dotnet/arcade build 20190815.27 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19415.27 - Microsoft.DotNet.Build.Tasks.Feed - 2.2.0-beta.19415.27 - Microsoft.DotNet.Build.Tasks.Packaging - 1.0.0-beta.19415.27 - Microsoft.DotNet.Helix.Sdk - 2.0.0-beta.19415.27 * Update dependencies from https://github.com/dotnet/arcade build 20190816.16 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19416.16 - Microsoft.DotNet.Build.Tasks.Feed - 2.2.0-beta.19416.16 - Microsoft.DotNet.Build.Tasks.Packaging - 1.0.0-beta.19416.16 - Microsoft.DotNet.Helix.Sdk - 2.0.0-beta.19416.16
1 parent c4df438 commit 7584f64

17 files changed

+138
-109
lines changed

‎eng/Version.Details.xml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,21 @@
22
<ProductDependencies>
33
</ProductDependencies>
44
<ToolsetDependencies>
5-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19412.7">
5+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19416.16">
66
<Uri>https://github.com/dotnet/arcade</Uri>
7-
<Sha>82c822ee7db08f5347e6ac44e3ed465248394a9e</Sha>
7+
<Sha>0e36c2410b72166a1b9a67142e652225e22feada</Sha>
88
</Dependency>
9-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.19412.7">
9+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.19416.16">
1010
<Uri>https://github.com/dotnet/arcade</Uri>
11-
<Sha>82c822ee7db08f5347e6ac44e3ed465248394a9e</Sha>
11+
<Sha>0e36c2410b72166a1b9a67142e652225e22feada</Sha>
1212
</Dependency>
13-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="2.2.0-beta.19412.7">
13+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="2.2.0-beta.19416.16">
1414
<Uri>https://github.com/dotnet/arcade</Uri>
15-
<Sha>82c822ee7db08f5347e6ac44e3ed465248394a9e</Sha>
15+
<Sha>0e36c2410b72166a1b9a67142e652225e22feada</Sha>
1616
</Dependency>
17-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="1.0.0-beta.19412.7">
17+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="1.0.0-beta.19416.16">
1818
<Uri>https://github.com/dotnet/arcade</Uri>
19-
<Sha>82c822ee7db08f5347e6ac44e3ed465248394a9e</Sha>
19+
<Sha>0e36c2410b72166a1b9a67142e652225e22feada</Sha>
2020
</Dependency>
2121
<Dependency Name="Microsoft.Private.CoreFx.NETCoreApp" Version="4.6.0-preview9.19415.9">
2222
<Uri>https://github.com/dotnet/corefx</Uri>

‎eng/Versions.props‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
<UsingToolXliff>false</UsingToolXliff>
1616
<!-- Package versions -->
1717
<!-- arcade -->
18-
<MicrosoftDotNetBuildTasksFeedVersion>2.2.0-beta.19412.7</MicrosoftDotNetBuildTasksFeedVersion>
19-
<MicrosoftDotNetBuildTasksPackagingVersion>1.0.0-beta.19412.7</MicrosoftDotNetBuildTasksPackagingVersion>
18+
<MicrosoftDotNetBuildTasksFeedVersion>2.2.0-beta.19416.16</MicrosoftDotNetBuildTasksFeedVersion>
19+
<MicrosoftDotNetBuildTasksPackagingVersion>1.0.0-beta.19416.16</MicrosoftDotNetBuildTasksPackagingVersion>
2020
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.19278.1</MicrosoftDotNetXUnitConsoleRunnerVersion>
2121
<!-- roslyn -->
2222
<MicrosoftNetCompilersToolsetVersion>3.3.0-beta2-19367-02</MicrosoftNetCompilersToolsetVersion>

‎eng/common/performance/performance-setup.ps1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Param(
22
[string] $SourceDirectory=$env:BUILD_SOURCESDIRECTORY,
33
[string] $CoreRootDirectory,
44
[string] $Architecture="x64",
5-
[string] $Framework="netcoreapp3.0",
5+
[string] $Framework="netcoreapp5.0",
66
[string] $CompilationMode="Tiered",
77
[string] $Repository=$env:BUILD_REPOSITORY_NAME,
88
[string] $Branch=$env:BUILD_SOURCEBRANCH,

‎eng/common/performance/performance-setup.sh‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
source_directory=$BUILD_SOURCESDIRECTORY
44
core_root_directory=
55
architecture=x64
6-
framework=netcoreapp3.0
6+
framework=netcoreapp5.0
77
compilation_mode=tiered
88
repository=$BUILD_REPOSITORY_NAME
99
branch=$BUILD_SOURCEBRANCH
@@ -156,6 +156,11 @@ if [[ "$use_core_run" = true ]]; then
156156
mv $core_root_directory $new_core_root
157157
fi
158158

159+
ci=true
160+
161+
_script_dir=$(pwd)/eng/common
162+
. "$_script_dir/pipeline-logging-functions.sh"
163+
159164
# Make sure all of our variables are available for future steps
160165
Write-PipelineSetVariable -name "UseCoreRun" -value "$use_core_run" -is_multi_job_variable false
161166
Write-PipelineSetVariable -name "Architecture" -value "$architecture" -is_multi_job_variable false

‎eng/common/post-build/darc-gather-drop.ps1‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,17 @@ try {
1919
ExitWithExitCode $exitCode
2020
}
2121

22+
# For now, only use a dry run.
23+
# Ideally we would change darc to enable a quick request that
24+
# would check whether the file exists that you can download it,
25+
# and that it won't conflict with other files.
26+
# https://github.com/dotnet/arcade/issues/3674
27+
# Right now we can't remove continue-on-error because we ocassionally will have
28+
# dependencies that have no associated builds (e.g. an old dependency).
29+
# We need to add an option to baseline specific dependencies away, or add them manually
30+
# to the BAR.
2231
darc gather-drop --non-shipping `
32+
--dry-run `
2333
--continue-on-error `
2434
--id $BarBuildId `
2535
--output-dir $DropLocation `

‎eng/common/post-build/dotnetsymbol-init.ps1‎

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

‎eng/common/post-build/sourcelink-cli-init.ps1‎

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

‎eng/common/sdl/execute-all-sdl-tools.ps1‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,8 @@ if ($TsaPublish) {
8686
if (-not $TsaRepositoryName) {
8787
$TsaRepositoryName = "$($Repository)-$($BranchName)"
8888
}
89-
Write-Host "$guardianCliLocation tsa-publish --all-tools --repository-name `"$TsaRepositoryName`" --branch-name `"$TsaBranchName`" --build-number `"$BuildNumber`" --codebase-name `"$TsaCodebaseName`" --notification-alias `"$TsaNotificationEmail`" --codebase-admin `"$TsaCodebaseAdmin`" --instance-url `"$TsaInstanceUrl`" --project-name `"$TsaProjectName`" --area-path `"$TsaBugAreaPath`" --iteration-path `"$TsaIterationPath`" --working-directory $SourceDirectory --logger-level $GuardianLoggerLevel"
90-
& $guardianCliLocation tsa-publish --all-tools --repository-name "$TsaRepositoryName" --branch-name "$TsaBranchName" --build-number "$BuildNumber" --codebase-name "$TsaCodebaseName" --notification-alias "$TsaNotificationEmail" --codebase-admin "$TsaCodebaseAdmin" --instance-url "$TsaInstanceUrl" --project-name "$TsaProjectName" --area-path "$TsaBugAreaPath" --iteration-path "$TsaIterationPath" --working-directory $ArtifactsDirectory --logger-level $GuardianLoggerLevel
89+
Write-Host "$guardianCliLocation tsa-publish --all-tools --repository-name `"$TsaRepositoryName`" --branch-name `"$TsaBranchName`" --build-number `"$BuildNumber`" --codebase-name `"$TsaCodebaseName`" --notification-alias `"$TsaNotificationEmail`" --codebase-admin `"$TsaCodebaseAdmin`" --instance-url `"$TsaInstanceUrl`" --project-name `"$TsaProjectName`" --area-path `"$TsaBugAreaPath`" --iteration-path `"$TsaIterationPath`" --working-directory $ArtifactsDirectory --logger-level $GuardianLoggerLevel"
90+
& $guardianCliLocation tsa-publish --all-tools --repository-name "$TsaRepositoryName" --branch-name "$TsaBranchName" --build-number "$BuildNumber" --onboard $True --codebase-name "$TsaCodebaseName" --notification-alias "$TsaNotificationEmail" --codebase-admin "$TsaCodebaseAdmin" --instance-url "$TsaInstanceUrl" --project-name "$TsaProjectName" --area-path "$TsaBugAreaPath" --iteration-path "$TsaIterationPath" --working-directory $ArtifactsDirectory --logger-level $GuardianLoggerLevel
9191
if ($LASTEXITCODE -ne 0) {
9292
Write-Host "Guardian tsa-publish failed with exit code $LASTEXITCODE."
9393
exit $LASTEXITCODE

‎eng/common/sdl/run-sdl.ps1‎

Lines changed: 11 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -25,19 +25,19 @@ if ($ValidPath -eq $False)
2525
exit 1
2626
}
2727

28+
$configParam = @("--config")
29+
2830
foreach ($tool in $ToolsList) {
2931
$gdnConfigFile = Join-Path $gdnConfigPath "$tool-configure.gdnconfig"
30-
$config = $False
3132
Write-Host $tool
3233
# We have to manually configure tools that run on source to look at the source directory only
3334
if ($tool -eq "credscan") {
34-
Write-Host "$GuardianCliLocation configure --working-directory $WorkingDirectory --tool $tool --output-path $gdnConfigFile --logger-level $GuardianLoggerLevel --noninteractive --force --args `" TargetDirectory : $TargetDirectory `" $(If ($CrScanAdditionalRunConfigParams) {$CrScanAdditionalRunConfigParams})"
35-
& $GuardianCliLocation configure --working-directory $WorkingDirectory --tool $tool --output-path $gdnConfigFile --logger-level $GuardianLoggerLevel --noninteractive --force --args " TargetDirectory : $TargetDirectory " $(If ($CrScanAdditionalRunConfigParams) {$CrScanAdditionalRunConfigParams})
35+
Write-Host "$GuardianCliLocation configure --working-directory $WorkingDirectory --tool $tool --output-path $gdnConfigFile --logger-level $GuardianLoggerLevel --noninteractive --force --args `" TargetDirectory : $TargetDirectory `" `" OutputType : pre `" $(If ($CrScanAdditionalRunConfigParams) {$CrScanAdditionalRunConfigParams})"
36+
& $GuardianCliLocation configure --working-directory $WorkingDirectory --tool $tool --output-path $gdnConfigFile --logger-level $GuardianLoggerLevel --noninteractive --force --args " TargetDirectory : $TargetDirectory " "OutputType : pre" $(If ($CrScanAdditionalRunConfigParams) {$CrScanAdditionalRunConfigParams})
3637
if ($LASTEXITCODE -ne 0) {
3738
Write-Host "Guardian configure for $tool failed with exit code $LASTEXITCODE."
3839
exit $LASTEXITCODE
3940
}
40-
$config = $True
4141
}
4242
if ($tool -eq "policheck") {
4343
Write-Host "$GuardianCliLocation configure --working-directory $WorkingDirectory --tool $tool --output-path $gdnConfigFile --logger-level $GuardianLoggerLevel --noninteractive --force --args `" Target : $TargetDirectory `" $(If ($PoliCheckAdditionalRunConfigParams) {$PoliCheckAdditionalRunConfigParams})"
@@ -46,22 +46,14 @@ foreach ($tool in $ToolsList) {
4646
Write-Host "Guardian configure for $tool failed with exit code $LASTEXITCODE."
4747
exit $LASTEXITCODE
4848
}
49-
$config = $True
5049
}
5150

52-
Write-Host "$GuardianCliLocation run --working-directory $WorkingDirectory --tool $tool --baseline mainbaseline --update-baseline $UpdateBaseline --logger-level $GuardianLoggerLevel --config $gdnConfigFile $config"
53-
if ($config) {
54-
& $GuardianCliLocation run --working-directory $WorkingDirectory --tool $tool --baseline mainbaseline --update-baseline $UpdateBaseline --logger-level $GuardianLoggerLevel --config $gdnConfigFile
55-
if ($LASTEXITCODE -ne 0) {
56-
Write-Host "Guardian run for $tool using $gdnConfigFile failed with exit code $LASTEXITCODE."
57-
exit $LASTEXITCODE
58-
}
59-
} else {
60-
& $GuardianCliLocation run --working-directory $WorkingDirectory --tool $tool --baseline mainbaseline --update-baseline $UpdateBaseline --logger-level $GuardianLoggerLevel
61-
if ($LASTEXITCODE -ne 0) {
62-
Write-Host "Guardian run for $tool failed with exit code $LASTEXITCODE."
63-
exit $LASTEXITCODE
64-
}
65-
}
51+
$configParam+=$gdnConfigFile
6652
}
6753

54+
Write-Host "$GuardianCliLocation run --working-directory $WorkingDirectory --baseline mainbaseline --update-baseline $UpdateBaseline --logger-level $GuardianLoggerLevel $configParam"
55+
& $GuardianCliLocation run --working-directory $WorkingDirectory --tool $tool --baseline mainbaseline --update-baseline $UpdateBaseline --logger-level $GuardianLoggerLevel $configParam
56+
if ($LASTEXITCODE -ne 0) {
57+
Write-Host "Guardian run for $ToolsList using $configParam failed with exit code $LASTEXITCODE."
58+
exit $LASTEXITCODE
59+
}

‎eng/common/templates/post-build/channels/internal-servicing.yml‎

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
parameters:
22
enableSymbolValidation: true
3+
symbolPublishingAdditionalParameters: ''
4+
artifactsPublishingAdditionalParameters: ''
35

46
stages:
57
- stage: IS_Publish
@@ -20,10 +22,16 @@ stages:
2022
vmImage: 'windows-2019'
2123
steps:
2224
- task: DownloadBuildArtifacts@0
23-
displayName: Download Artifacts
25+
displayName: Download Blob Artifacts
26+
inputs:
27+
artifactName: 'BlobArtifacts'
28+
continueOnError: true
29+
30+
- task: DownloadBuildArtifacts@0
31+
displayName: Download PDB Artifacts
2432
inputs:
25-
downloadType: specific files
26-
matchingPattern: "*Artifacts*"
33+
artifactName: 'PDBArtifacts'
34+
continueOnError: true
2735

2836
- task: PowerShell@2
2937
displayName: Publish
@@ -34,7 +42,9 @@ stages:
3442
/p:DotNetSymbolServerTokenSymWeb=$(symweb-symbol-server-pat)
3543
/p:PDBArtifactsDirectory='$(Build.ArtifactStagingDirectory)/PDBArtifacts/'
3644
/p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/'
45+
/p:SymbolPublishingExclusionsFile='$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt'
3746
/p:Configuration=Release
47+
${{ parameters.symbolPublishingAdditionalParameters }}
3848

3949
- job: publish_assets
4050
displayName: Publish Assets
@@ -92,6 +102,7 @@ stages:
92102
/p:BlobBasePath='$(Build.ArtifactStagingDirectory)\BlobArtifacts'
93103
/p:PackageBasePath='$(Build.ArtifactStagingDirectory)\PackageArtifacts'
94104
/p:Configuration=Release
105+
${{ parameters.artifactsPublishingAdditionalParameters }}
95106

96107
- task: NuGetCommand@2
97108
displayName: Publish Packages to AzDO Feed

0 commit comments

Comments
 (0)