Skip to content
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

[main] Update dependencies from dotnet/arcade #565

Open
wants to merge 95 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
95 commits
Select commit Hold shift + click to select a range
43165bd
Update dependencies from https://github.com/dotnet/arcade build 20240…
dotnet-maestro[bot] Jul 10, 2024
d2cbf35
Update dependencies from https://github.com/dotnet/arcade build 20240…
dotnet-maestro[bot] Jul 11, 2024
fec1956
Update dependencies from https://github.com/dotnet/arcade build 20240…
dotnet-maestro[bot] Jul 12, 2024
b25fcdc
Update dependencies from https://github.com/dotnet/arcade build 20240…
dotnet-maestro[bot] Jul 13, 2024
325d86a
Update dependencies from https://github.com/dotnet/arcade build 20240…
dotnet-maestro[bot] Jul 14, 2024
f18aea9
Update dependencies from https://github.com/dotnet/arcade build 20240…
dotnet-maestro[bot] Jul 15, 2024
5200ef6
Update dependencies from https://github.com/dotnet/arcade build 20240…
dotnet-maestro[bot] Jul 16, 2024
3d83107
Update dependencies from https://github.com/dotnet/arcade build 20240…
dotnet-maestro[bot] Jul 17, 2024
11555aa
Update dependencies from https://github.com/dotnet/arcade build 20240…
dotnet-maestro[bot] Jul 18, 2024
f2010c1
Update dependencies from https://github.com/dotnet/arcade build 20240…
dotnet-maestro[bot] Jul 19, 2024
79ed555
Update dependencies from https://github.com/dotnet/arcade build 20240…
dotnet-maestro[bot] Jul 20, 2024
fd641f8
Update dependencies from https://github.com/dotnet/arcade build 20240…
dotnet-maestro[bot] Jul 21, 2024
c02dd99
Update dependencies from https://github.com/dotnet/arcade build 20240…
dotnet-maestro[bot] Jul 22, 2024
8f5c784
Update dependencies from https://github.com/dotnet/arcade build 20240…
dotnet-maestro[bot] Jul 23, 2024
1dd9e20
Update dependencies from https://github.com/dotnet/arcade build 20240…
dotnet-maestro[bot] Jul 24, 2024
e37d5dc
Update dependencies from https://github.com/dotnet/arcade build 20240…
dotnet-maestro[bot] Jul 25, 2024
59120c3
Update dependencies from https://github.com/dotnet/arcade build 20240…
dotnet-maestro[bot] Jul 26, 2024
7a08909
Update dependencies from https://github.com/dotnet/arcade build 20240…
dotnet-maestro[bot] Jul 27, 2024
d939696
Update dependencies from https://github.com/dotnet/arcade build 20240…
dotnet-maestro[bot] Jul 28, 2024
d8e4fcf
Update dependencies from https://github.com/dotnet/arcade build 20240…
dotnet-maestro[bot] Jul 29, 2024
f62032f
Update dependencies from https://github.com/dotnet/arcade build 20240…
dotnet-maestro[bot] Jul 30, 2024
84ca449
Update dependencies from https://github.com/dotnet/arcade build 20240…
dotnet-maestro[bot] Jul 31, 2024
2b125f7
Update dependencies from https://github.com/dotnet/arcade build 20240…
dotnet-maestro[bot] Aug 1, 2024
c387243
Update dependencies from https://github.com/dotnet/arcade build 20240…
dotnet-maestro[bot] Aug 2, 2024
9f4086e
Update dependencies from https://github.com/dotnet/arcade build 20240…
dotnet-maestro[bot] Aug 3, 2024
530f59a
Update dependencies from https://github.com/dotnet/arcade build 20240…
dotnet-maestro[bot] Aug 4, 2024
9c4572c
Update dependencies from https://github.com/dotnet/arcade build 20240…
dotnet-maestro[bot] Aug 5, 2024
9b19e08
Update dependencies from https://github.com/dotnet/arcade build 20240…
dotnet-maestro[bot] Aug 7, 2024
4d4aef5
Update dependencies from https://github.com/dotnet/arcade build 20240…
dotnet-maestro[bot] Aug 8, 2024
b2603e8
Update dependencies from https://github.com/dotnet/arcade build 20240…
dotnet-maestro[bot] Aug 9, 2024
5fcecb7
Update dependencies from https://github.com/dotnet/arcade build 20240…
dotnet-maestro[bot] Aug 15, 2024
16fec96
Update dependencies from https://github.com/dotnet/arcade build 20240…
dotnet-maestro[bot] Aug 17, 2024
056a404
Update dependencies from https://github.com/dotnet/arcade build 20240…
dotnet-maestro[bot] Aug 21, 2024
27ddb47
Update dependencies from https://github.com/dotnet/arcade build 20240…
dotnet-maestro[bot] Aug 21, 2024
2ce5a34
Update dependencies from https://github.com/dotnet/arcade build 20240…
dotnet-maestro[bot] Aug 22, 2024
ec6b861
Update dependencies from https://github.com/dotnet/arcade build 20240…
dotnet-maestro[bot] Aug 24, 2024
a872a62
Update dependencies from https://github.com/dotnet/arcade build 20240…
dotnet-maestro[bot] Aug 27, 2024
ac1fbac
Update dependencies from https://github.com/dotnet/arcade build 20240…
dotnet-maestro[bot] Aug 29, 2024
b8c8f2e
Update dependencies from https://github.com/dotnet/arcade build 20240…
dotnet-maestro[bot] Aug 30, 2024
86e6edd
Update dependencies from https://github.com/dotnet/arcade build 20240…
dotnet-maestro[bot] Aug 31, 2024
ce50d0f
Update dependencies from https://github.com/dotnet/arcade build 20240…
dotnet-maestro[bot] Sep 6, 2024
3521599
Update dependencies from https://github.com/dotnet/arcade build 20240…
dotnet-maestro[bot] Sep 7, 2024
3fde9c9
Update dependencies from https://github.com/dotnet/arcade build 20240…
dotnet-maestro[bot] Sep 9, 2024
485ed26
Update dependencies from https://github.com/dotnet/arcade build 20240…
dotnet-maestro[bot] Sep 10, 2024
c3d2220
Update dependencies from https://github.com/dotnet/arcade build 20240…
dotnet-maestro[bot] Sep 12, 2024
f070f7b
Update dependencies from https://github.com/dotnet/arcade build 20240…
dotnet-maestro[bot] Sep 13, 2024
8a56245
Update dependencies from https://github.com/dotnet/arcade build 20240…
dotnet-maestro[bot] Sep 14, 2024
b40f306
Update dependencies from https://github.com/dotnet/arcade build 20240…
dotnet-maestro[bot] Sep 17, 2024
916d223
Update dependencies from https://github.com/dotnet/arcade build 20240…
dotnet-maestro[bot] Sep 18, 2024
2a0afc7
Update dependencies from https://github.com/dotnet/arcade build 20240…
dotnet-maestro[bot] Sep 24, 2024
71eae6d
Update dependencies from https://github.com/dotnet/arcade build 20240…
dotnet-maestro[bot] Sep 26, 2024
69f3a0a
Update dependencies from https://github.com/dotnet/arcade build 20240…
dotnet-maestro[bot] Sep 27, 2024
b305e7d
Update dependencies from https://github.com/dotnet/arcade build 20241…
dotnet-maestro[bot] Oct 2, 2024
079728d
Update dependencies from https://github.com/dotnet/arcade build 20241…
dotnet-maestro[bot] Oct 4, 2024
5522d2b
Update dependencies from https://github.com/dotnet/arcade build 20241…
dotnet-maestro[bot] Oct 5, 2024
93bf1b0
Update dependencies from https://github.com/dotnet/arcade build 20241…
dotnet-maestro[bot] Oct 10, 2024
8606184
Update dependencies from https://github.com/dotnet/arcade build 20241…
dotnet-maestro[bot] Oct 11, 2024
3e0a1fb
Update dependencies from https://github.com/dotnet/arcade build 20241…
dotnet-maestro[bot] Oct 12, 2024
016f102
Update dependencies from https://github.com/dotnet/arcade build 20241…
dotnet-maestro[bot] Oct 15, 2024
c02026e
Update dependencies from https://github.com/dotnet/arcade build 20241…
dotnet-maestro[bot] Oct 16, 2024
52d2fdd
Update dependencies from https://github.com/dotnet/arcade build 20241…
dotnet-maestro[bot] Oct 23, 2024
e260677
Update dependencies from https://github.com/dotnet/arcade build 20241…
dotnet-maestro[bot] Oct 24, 2024
c3fa3b2
Update dependencies from https://github.com/dotnet/arcade build 20241…
dotnet-maestro[bot] Oct 25, 2024
67ce134
Update dependencies from https://github.com/dotnet/arcade build 20241…
dotnet-maestro[bot] Oct 26, 2024
d979c5f
Update dependencies from https://github.com/dotnet/arcade build 20241…
dotnet-maestro[bot] Oct 28, 2024
4958436
Update dependencies from https://github.com/dotnet/arcade build 20241…
dotnet-maestro[bot] Oct 30, 2024
6ad3c58
Update dependencies from https://github.com/dotnet/arcade build 20241…
dotnet-maestro[bot] Oct 31, 2024
b24d644
Update dependencies from https://github.com/dotnet/arcade build 20241…
dotnet-maestro[bot] Nov 1, 2024
2a2b214
Update dependencies from https://github.com/dotnet/arcade build 20241…
dotnet-maestro[bot] Nov 2, 2024
2c1ac1e
Update dependencies from https://github.com/dotnet/arcade build 20241…
dotnet-maestro[bot] Nov 5, 2024
71b6817
Update dependencies from https://github.com/dotnet/arcade build 20241…
dotnet-maestro[bot] Nov 7, 2024
0a40675
Update dependencies from https://github.com/dotnet/arcade build 20241…
dotnet-maestro[bot] Nov 8, 2024
b55c8b1
Update dependencies from https://github.com/dotnet/arcade build 20241…
dotnet-maestro[bot] Nov 10, 2024
6eccac4
Update dependencies from https://github.com/dotnet/arcade build 20241…
dotnet-maestro[bot] Nov 11, 2024
a5ae842
Update dependencies from https://github.com/dotnet/arcade build 20241…
dotnet-maestro[bot] Nov 12, 2024
360eb8b
Update dependencies from https://github.com/dotnet/arcade build 20241…
dotnet-maestro[bot] Nov 13, 2024
92abfcd
Update dependencies from https://github.com/dotnet/arcade build 20241…
dotnet-maestro[bot] Nov 14, 2024
57b2961
Update dependencies from https://github.com/dotnet/arcade build 20241…
dotnet-maestro[bot] Nov 20, 2024
1e44c86
Update dependencies from https://github.com/dotnet/arcade build 20241…
dotnet-maestro[bot] Nov 21, 2024
4837bc2
Update dependencies from https://github.com/dotnet/arcade build 20241…
dotnet-maestro[bot] Nov 24, 2024
26a5124
Update dependencies from https://github.com/dotnet/arcade build 20241…
dotnet-maestro[bot] Nov 26, 2024
0940daa
Update dependencies from https://github.com/dotnet/arcade build 20241…
dotnet-maestro[bot] Nov 27, 2024
7208542
Update dependencies from https://github.com/dotnet/arcade build 20241…
dotnet-maestro[bot] Nov 28, 2024
cb2cf61
Update dependencies from https://github.com/dotnet/arcade build 20241…
dotnet-maestro[bot] Nov 29, 2024
a4ce62b
Update dependencies from https://github.com/dotnet/arcade build 20241…
dotnet-maestro[bot] Dec 5, 2024
7a32457
Update dependencies from https://github.com/dotnet/arcade build 20241…
dotnet-maestro[bot] Dec 6, 2024
27396e8
Update dependencies from https://github.com/dotnet/arcade build 20241…
dotnet-maestro[bot] Dec 7, 2024
021d15a
Update dependencies from https://github.com/dotnet/arcade build 20241…
dotnet-maestro[bot] Dec 10, 2024
d104e49
Update dependencies from https://github.com/dotnet/arcade build 20241…
dotnet-maestro[bot] Dec 11, 2024
01a5f38
Update dependencies from https://github.com/dotnet/arcade build 20241…
dotnet-maestro[bot] Dec 12, 2024
ed19af3
Update dependencies from https://github.com/dotnet/arcade build 20241…
dotnet-maestro[bot] Dec 13, 2024
91492b0
Update dependencies from https://github.com/dotnet/arcade build 20241…
dotnet-maestro[bot] Dec 14, 2024
570ef06
Update dependencies from https://github.com/dotnet/arcade build 20241…
dotnet-maestro[bot] Dec 17, 2024
ae902df
Update dependencies from https://github.com/dotnet/arcade build 20241…
dotnet-maestro[bot] Dec 18, 2024
1a4d38e
Update dependencies from https://github.com/dotnet/arcade build 20241…
dotnet-maestro[bot] Dec 22, 2024
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
4 changes: 2 additions & 2 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
<ProductDependencies>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24352.2">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.24622.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>4a7d983f833d6b86365ea1b2b4d6ee72fbdbf944</Sha>
<Sha>8589bd2a216025d753b5f107081bfa28a2d51bb8</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
2 changes: 1 addition & 1 deletion eng/common/SetupNugetSources.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ if ($dotnet31Source -ne $null) {
AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v2" -Creds $creds -Username $userName -pwd $Password
}

$dotnetVersions = @('5','6','7','8')
$dotnetVersions = @('5','6','7','8','9')

foreach ($dotnetVersion in $dotnetVersions) {
$feedPrefix = "dotnet" + $dotnetVersion;
Expand Down
2 changes: 1 addition & 1 deletion eng/common/SetupNugetSources.sh
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ if [ "$?" == "0" ]; then
PackageSources+=('dotnet3.1-internal-transport')
fi

DotNetVersions=('5' '6' '7' '8')
DotNetVersions=('5' '6' '7' '8' '9')

for DotNetVersion in ${DotNetVersions[@]} ; do
FeedPrefix="dotnet${DotNetVersion}";
Expand Down
1 change: 0 additions & 1 deletion eng/common/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,6 @@ function Build {
/p:Restore=$restore \
/p:Build=$build \
/p:DotNetBuildRepo=$product_build \
/p:ArcadeBuildFromSource=$source_build \
/p:DotNetBuildSourceOnly=$source_build \
/p:Rebuild=$rebuild \
/p:Test=$test \
Expand Down
33 changes: 10 additions & 23 deletions eng/common/core-templates/job/job.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ parameters:
# publishing defaults
artifacts: ''
enableMicrobuild: false
enableMicrobuildForMacAndLinux: false
enablePublishBuildArtifacts: false
enablePublishBuildAssets: false
enablePublishTestResults: false
Expand All @@ -33,11 +34,6 @@ parameters:
artifactPublishSteps: []
runAsPublic: false

# Sbom related params
enableSbom: true
PackageVersion: 9.0.0
BuildDropPath: '$(Build.SourcesDirectory)/artifacts'

# 1es specific parameters
is1ESPipeline: ''

Expand Down Expand Up @@ -132,18 +128,11 @@ jobs:
- ${{ preStep }}

- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
- ${{ if eq(parameters.enableMicrobuild, 'true') }}:
- task: MicroBuildSigningPlugin@4
displayName: Install MicroBuild plugin
inputs:
signType: $(_SignType)
zipSources: false
feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json
env:
TeamName: $(_TeamName)
MicroBuildOutputFolderOverride: '$(Agent.TempDirectory)'
- template: /eng/common/core-templates/steps/install-microbuild.yml
parameters:
enableMicrobuild: ${{ parameters.enableMicrobuild }}
enableMicrobuildForMacAndLinux: ${{ parameters.enableMicrobuildForMacAndLinux }}
continueOnError: ${{ parameters.continueOnError }}
condition: and(succeeded(), in(variables['_SignType'], 'real', 'test'), eq(variables['Agent.Os'], 'Windows_NT'))

- ${{ if and(eq(parameters.runAsPublic, 'false'), eq(variables['System.TeamProject'], 'internal')) }}:
- task: NuGetAuthenticate@1
Expand Down Expand Up @@ -172,14 +161,12 @@ jobs:
- ${{ each step in parameters.componentGovernanceSteps }}:
- ${{ step }}

- ${{ if eq(parameters.enableMicrobuild, 'true') }}:
- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
- task: MicroBuildCleanup@1
displayName: Execute Microbuild cleanup tasks
condition: and(always(), in(variables['_SignType'], 'real', 'test'), eq(variables['Agent.Os'], 'Windows_NT'))
- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
- template: /eng/common/core-templates/steps/cleanup-microbuild.yml
parameters:
enableMicrobuild: ${{ parameters.enableMicrobuild }}
enableMicrobuildForMacAndLinux: ${{ parameters.enableMicrobuildForMacAndLinux }}
continueOnError: ${{ parameters.continueOnError }}
env:
TeamName: $(_TeamName)

# Publish test results
- ${{ if or(and(eq(parameters.enablePublishTestResults, 'true'), eq(parameters.testResultsFormat, '')), eq(parameters.testResultsFormat, 'xunit')) }}:
Expand Down
32 changes: 7 additions & 25 deletions eng/common/core-templates/job/publish-build-assets.yml
Original file line number Diff line number Diff line change
Expand Up @@ -113,38 +113,19 @@ jobs:
Add-Content -Path $filePath -Value "$(DefaultChannels)"
Add-Content -Path $filePath -Value $(IsStableBuild)

- template: /eng/common/core-templates/steps/publish-build-artifacts.yml
parameters:
is1ESPipeline: ${{ parameters.is1ESPipeline }}
args:
displayName: Publish ReleaseConfigs Artifact
pathToPublish: '$(Build.StagingDirectory)/ReleaseConfigs'
publishLocation: Container
artifactName: ReleaseConfigs

- task: powershell@2
displayName: Check if SymbolPublishingExclusionsFile.txt exists
inputs:
targetType: inline
script: |
$symbolExclusionfile = "$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt"
if(Test-Path -Path $symbolExclusionfile)
if (Test-Path -Path $symbolExclusionfile)
{
Write-Host "SymbolExclusionFile exists"
Write-Host "##vso[task.setvariable variable=SymbolExclusionFile]true"
}
else{
Write-Host "Symbols Exclusion file does not exist"
Write-Host "##vso[task.setvariable variable=SymbolExclusionFile]false"
Copy-Item -Path $symbolExclusionfile -Destination "$(Build.StagingDirectory)/ReleaseConfigs"
}

- template: /eng/common/core-templates/steps/publish-build-artifacts.yml
parameters:
is1ESPipeline: ${{ parameters.is1ESPipeline }}
args:
displayName: Publish SymbolPublishingExclusionsFile Artifact
condition: eq(variables['SymbolExclusionFile'], 'true')
pathToPublish: '$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt'
displayName: Publish ReleaseConfigs Artifact
pathToPublish: '$(Build.StagingDirectory)/ReleaseConfigs'
publishLocation: Container
artifactName: ReleaseConfigs

Expand All @@ -162,9 +143,10 @@ jobs:
scriptType: ps
scriptLocation: scriptPath
scriptPath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1
arguments: -BuildId $(BARBuildId)
arguments: >
-BuildId $(BARBuildId)
-PublishingInfraVersion 3
-AzdoToken '$(publishing-dnceng-devdiv-code-r-build-re)'
-AzdoToken '$(System.AccessToken)'
-WaitPublishingFinish true
-ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}'
-SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}'
Expand Down
5 changes: 3 additions & 2 deletions eng/common/core-templates/job/source-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,10 @@ parameters:
# The name of the job. This is included in the job ID.
# targetRID: ''
# The name of the target RID to use, instead of the one auto-detected by Arcade.
# nonPortable: false
# portableBuild: false
# Enables non-portable mode. This means a more specific RID (e.g. fedora.32-x64 rather than
# linux-x64), and compiling against distro-provided packages rather than portable ones.
# linux-x64), and compiling against distro-provided packages rather than portable ones. The
# default is portable mode.
# skipPublishValidation: false
# Disables publishing validation. By default, a check is performed to ensure no packages are
# published by source-build.
Expand Down
41 changes: 3 additions & 38 deletions eng/common/core-templates/job/source-index-stage1.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
parameters:
runAsPublic: false
sourceIndexUploadPackageVersion: 2.0.0-20240522.1
sourceIndexProcessBinlogPackageVersion: 1.0.1-20240522.1
sourceIndexPackageSource: https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json
sourceIndexBuildCommand: powershell -NoLogo -NoProfile -ExecutionPolicy Bypass -Command "eng/common/build.ps1 -restore -build -binarylog -ci"
preSteps: []
binlogPath: artifacts/log/Debug/Build.binlog
Expand All @@ -16,12 +13,6 @@ jobs:
dependsOn: ${{ parameters.dependsOn }}
condition: ${{ parameters.condition }}
variables:
- name: SourceIndexUploadPackageVersion
value: ${{ parameters.sourceIndexUploadPackageVersion }}
- name: SourceIndexProcessBinlogPackageVersion
value: ${{ parameters.sourceIndexProcessBinlogPackageVersion }}
- name: SourceIndexPackageSource
value: ${{ parameters.sourceIndexPackageSource }}
- name: BinlogPath
value: ${{ parameters.binlogPath }}
- template: /eng/common/core-templates/variables/pool-providers.yml
Expand All @@ -45,35 +36,9 @@ jobs:

- ${{ each preStep in parameters.preSteps }}:
- ${{ preStep }}

- task: UseDotNet@2
displayName: Use .NET 8 SDK
inputs:
packageType: sdk
version: 8.0.x
installationPath: $(Agent.TempDirectory)/dotnet
workingDirectory: $(Agent.TempDirectory)

- script: |
$(Agent.TempDirectory)/dotnet/dotnet tool install BinLogToSln --version $(sourceIndexProcessBinlogPackageVersion) --add-source $(SourceIndexPackageSource) --tool-path $(Agent.TempDirectory)/.source-index/tools
$(Agent.TempDirectory)/dotnet/dotnet tool install UploadIndexStage1 --version $(sourceIndexUploadPackageVersion) --add-source $(SourceIndexPackageSource) --tool-path $(Agent.TempDirectory)/.source-index/tools
displayName: Download Tools
# Set working directory to temp directory so 'dotnet' doesn't try to use global.json and use the repo's sdk.
workingDirectory: $(Agent.TempDirectory)

- script: ${{ parameters.sourceIndexBuildCommand }}
displayName: Build Repository

- script: $(Agent.TempDirectory)/.source-index/tools/BinLogToSln -i $(BinlogPath) -r $(Build.SourcesDirectory) -n $(Build.Repository.Name) -o .source-index/stage1output
displayName: Process Binlog into indexable sln

- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
- task: AzureCLI@2
displayName: Log in to Azure and upload stage1 artifacts to source index
inputs:
azureSubscription: 'SourceDotNet Stage1 Publish'
addSpnToEnvironment: true
scriptType: 'ps'
scriptLocation: 'inlineScript'
inlineScript: |
$(Agent.TempDirectory)/.source-index/tools/UploadIndexStage1 -i .source-index/stage1output -n $(Build.Repository.Name) -s netsourceindexstage1 -b stage1
- template: /eng/common/core-templates/steps/source-index-stage1-publish.yml
parameters:
binLogPath: ${{ parameters.binLogPath }}
5 changes: 3 additions & 2 deletions eng/common/core-templates/post-build/post-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -307,9 +307,10 @@ stages:
scriptType: ps
scriptLocation: scriptPath
scriptPath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1
arguments: -BuildId $(BARBuildId)
arguments: >
-BuildId $(BARBuildId)
-PublishingInfraVersion ${{ parameters.publishingInfraVersion }}
-AzdoToken '$(publishing-dnceng-devdiv-code-r-build-re)'
-AzdoToken '$(System.AccessToken)'
-WaitPublishingFinish true
-ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}'
-SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}'
28 changes: 28 additions & 0 deletions eng/common/core-templates/steps/cleanup-microbuild.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
parameters:
# Enable cleanup tasks for MicroBuild
enableMicrobuild: false
# Enable cleanup tasks for MicroBuild on Mac and Linux
# Will be ignored if 'enableMicrobuild' is false or 'Agent.Os' is 'Windows_NT'
enableMicrobuildForMacAndLinux: false
continueOnError: false

steps:
- ${{ if eq(parameters.enableMicrobuild, 'true') }}:
- task: MicroBuildCleanup@1
displayName: Execute Microbuild cleanup tasks
condition: and(
always(),
or(
and(
eq(variables['Agent.Os'], 'Windows_NT'),
in(variables['_SignType'], 'real', 'test')
),
and(
${{ eq(parameters.enableMicrobuildForMacAndLinux, true) }},
ne(variables['Agent.Os'], 'Windows_NT'),
eq(variables['_SignType'], 'real')
)
))
continueOnError: ${{ parameters.continueOnError }}
env:
TeamName: $(_TeamName)
16 changes: 15 additions & 1 deletion eng/common/core-templates/steps/get-federated-access-token.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,31 @@ parameters:
type: string
- name: outputVariableName
type: string
- name: is1ESPipeline
type: boolean
- name: stepName
type: string
default: 'getFederatedAccessToken'
- name: condition
type: string
default: ''
# Resource to get a token for. Common values include:
# - '499b84ac-1321-427f-aa17-267ca6975798' for Azure DevOps
# - 'https://storage.azure.com/' for storage
# Defaults to Azure DevOps
- name: resource
type: string
default: '499b84ac-1321-427f-aa17-267ca6975798'
- name: isStepOutputVariable
type: boolean
default: false

steps:
- task: AzureCLI@2
displayName: 'Getting federated access token for feeds'
name: ${{ parameters.stepName }}
${{ if ne(parameters.condition, '') }}:
condition: ${{ parameters.condition }}
inputs:
azureSubscription: ${{ parameters.federatedServiceConnection }}
scriptType: 'pscore'
Expand All @@ -25,4 +39,4 @@ steps:
exit 1
}
Write-Host "Setting '${{ parameters.outputVariableName }}' with the access token value"
Write-Host "##vso[task.setvariable variable=${{ parameters.outputVariableName }};issecret=true]$accessToken"
Write-Host "##vso[task.setvariable variable=${{ parameters.outputVariableName }};issecret=true;isOutput=${{ parameters.isStepOutputVariable }}]$accessToken"
73 changes: 73 additions & 0 deletions eng/common/core-templates/steps/install-microbuild.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
parameters:
# Enable install tasks for MicroBuild
enableMicrobuild: false
# Enable install tasks for MicroBuild on Mac and Linux
# Will be ignored if 'enableMicrobuild' is false or 'Agent.Os' is 'Windows_NT'
enableMicrobuildForMacAndLinux: false
# Location of the MicroBuild output folder
microBuildOutputFolder: '$(Agent.TempDirectory)'
continueOnError: false

steps:
- ${{ if eq(parameters.enableMicrobuild, 'true') }}:
- ${{ if eq(parameters.enableMicrobuildForMacAndLinux, 'true') }}:
# Install Python 3.12.x on when Python > 3.12.x is installed - https://github.com/dotnet/source-build/issues/4802
- script: |
version=$(python3 --version | awk '{print $2}')
major=$(echo $version | cut -d. -f1)
minor=$(echo $version | cut -d. -f2)

installPython=false
if [ "$major" -gt 3 ] || { [ "$major" -eq 3 ] && [ "$minor" -gt 12 ]; }; then
installPython=true
fi

echo "Python version: $version."
echo "Install Python 3.12.x: $installPython."
echo "##vso[task.setvariable variable=installPython;isOutput=true]$installPython"
name: InstallPython
displayName: 'Determine Python installation'
condition: and(succeeded(), ne(variables['Agent.Os'], 'Windows_NT'))

- task: UsePythonVersion@0
inputs:
versionSpec: '3.12.x'
displayName: 'Use Python 3.12.x'
condition: and(succeeded(), eq(variables['InstallPython.installPython'], 'true'), ne(variables['Agent.Os'], 'Windows_NT'))

# Needed to download the MicroBuild plugin nupkgs on Mac and Linux when nuget.exe is unavailable
- task: UseDotNet@2
displayName: Install .NET 8.0 SDK for MicroBuild Plugin
inputs:
packageType: sdk
version: 8.0.x
installationPath: ${{ parameters.microBuildOutputFolder }}/dotnet
workingDirectory: ${{ parameters.microBuildOutputFolder }}
condition: and(succeeded(), ne(variables['Agent.Os'], 'Windows_NT'))

- task: MicroBuildSigningPlugin@4
displayName: Install MicroBuild plugin
inputs:
signType: $(_SignType)
zipSources: false
feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json
${{ if and(eq(parameters.enableMicrobuildForMacAndLinux, 'true'), ne(variables['Agent.Os'], 'Windows_NT')) }}:
azureSubscription: 'MicroBuild Signing Task (DevDiv)'
env:
TeamName: $(_TeamName)
MicroBuildOutputFolderOverride: ${{ parameters.microBuildOutputFolder }}
SYSTEM_ACCESSTOKEN: $(System.AccessToken)
continueOnError: ${{ parameters.continueOnError }}
condition: and(
succeeded(),
or(
and(
eq(variables['Agent.Os'], 'Windows_NT'),
in(variables['_SignType'], 'real', 'test')
),
and(
${{ eq(parameters.enableMicrobuildForMacAndLinux, true) }},
ne(variables['Agent.Os'], 'Windows_NT'),
eq(variables['_SignType'], 'real')
)
))
Loading