Skip to content

Commit 37b28c7

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
Update dependencies from https://github.com/dotnet/arcade build 20250412.1 (#661)
Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Helix.Sdk From Version 10.0.0-beta.25206.1 -> To Version 10.0.0-beta.25212.1 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1 parent c9da41d commit 37b28c7

File tree

8 files changed

+52
-25
lines changed

8 files changed

+52
-25
lines changed

‎eng/Version.Details.xml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,23 +8,23 @@
88
</Dependency>
99
</ProductDependencies>
1010
<ToolsetDependencies>
11-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25206.1">
11+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25212.1">
1212
<Uri>https://github.com/dotnet/arcade</Uri>
13-
<Sha>37f732fbfa006386f89a16be417278ea4fee375e</Sha>
13+
<Sha>87401be5731aa537bbf4cb71d7800d1c74d5e429</Sha>
1414
</Dependency>
1515
<!-- Intermediate is necessary for source build. -->
16-
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="10.0.0-beta.25206.1">
16+
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="10.0.0-beta.25212.1">
1717
<Uri>https://github.com/dotnet/arcade</Uri>
18-
<Sha>37f732fbfa006386f89a16be417278ea4fee375e</Sha>
18+
<Sha>87401be5731aa537bbf4cb71d7800d1c74d5e429</Sha>
1919
<SourceBuild RepoName="arcade" ManagedOnly="true" />
2020
</Dependency>
21-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25206.1">
21+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25212.1">
2222
<Uri>https://github.com/dotnet/arcade</Uri>
23-
<Sha>37f732fbfa006386f89a16be417278ea4fee375e</Sha>
23+
<Sha>87401be5731aa537bbf4cb71d7800d1c74d5e429</Sha>
2424
</Dependency>
25-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="10.0.0-beta.25206.1">
25+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="10.0.0-beta.25212.1">
2626
<Uri>https://github.com/dotnet/arcade</Uri>
27-
<Sha>37f732fbfa006386f89a16be417278ea4fee375e</Sha>
27+
<Sha>87401be5731aa537bbf4cb71d7800d1c74d5e429</Sha>
2828
</Dependency>
2929
</ToolsetDependencies>
3030
</Dependencies>

‎eng/Versions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@
66
<PreReleaseVersionIteration>1</PreReleaseVersionIteration>
77
</PropertyGroup>
88
<PropertyGroup>
9-
<MicrosoftDotNetBuildTasksPackagingVersion>10.0.0-beta.25206.1</MicrosoftDotNetBuildTasksPackagingVersion>
9+
<MicrosoftDotNetBuildTasksPackagingVersion>10.0.0-beta.25212.1</MicrosoftDotNetBuildTasksPackagingVersion>
1010
</PropertyGroup>
1111
</Project>

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

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,9 @@ parameters:
2929

3030
is1ESPipeline: ''
3131

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

@@ -72,14 +75,15 @@ jobs:
7275
- checkout: self
7376
fetchDepth: 3
7477
clean: true
75-
76-
- task: DownloadPipelineArtifact@2
77-
displayName: Download Asset Manifests
78-
inputs:
79-
artifactName: AssetManifests
80-
targetPath: '$(Build.StagingDirectory)/AssetManifests'
81-
condition: ${{ parameters.condition }}
82-
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 }}
8387

8488
- task: NuGetAuthenticate@1
8589

@@ -92,6 +96,7 @@ jobs:
9296
scriptPath: $(Build.SourcesDirectory)/eng/common/sdk-task.ps1
9397
arguments: -task PublishBuildAssets -restore -msbuildEngine dotnet
9498
/p:ManifestsPath='$(Build.StagingDirectory)/AssetManifests'
99+
/p:IsAssetlessBuild=${{ parameters.isAssetlessBuild }}
95100
/p:MaestroApiEndpoint=https://maestro.dot.net
96101
/p:OfficialBuildId=$(Build.BuildNumber)
97102
condition: ${{ parameters.condition }}
@@ -124,7 +129,7 @@ jobs:
124129
publishLocation: Container
125130
artifactName: ReleaseConfigs
126131

127-
- ${{ if eq(parameters.publishAssetsImmediately, 'true') }}:
132+
- ${{ if or(eq(parameters.publishAssetsImmediately, 'true'), eq(parameters.isAssetlessBuild, 'true')) }}:
128133
- template: /eng/common/core-templates/post-build/setup-maestro-vars.yml
129134
parameters:
130135
BARBuildId: ${{ parameters.BARBuildId }}
@@ -145,6 +150,7 @@ jobs:
145150
-WaitPublishingFinish true
146151
-ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}'
147152
-SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}'
153+
-SkipAssetsPublishing '${{ parameters.isAssetlessBuild }}'
148154
149155
- ${{ if eq(parameters.enablePublishBuildArtifacts, 'true') }}:
150156
- template: /eng/common/core-templates/steps/publish-logs.yml

‎eng/common/core-templates/post-build/post-build.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,11 @@ parameters:
6060
artifactNames: ''
6161
downloadArtifacts: true
6262

63+
- name: isAssetlessBuild
64+
type: boolean
65+
displayName: Is Assetless Build
66+
default: false
67+
6368
# These parameters let the user customize the call to sdk-task.ps1 for publishing
6469
# symbols & general artifacts as well as for signing validation
6570
- name: symbolPublishingAdditionalParameters
@@ -320,3 +325,4 @@ stages:
320325
-RequireDefaultChannels ${{ parameters.requireDefaultChannels }}
321326
-ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}'
322327
-SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}'
328+
-SkipAssetsPublishing '${{ parameters.isAssetlessBuild }}'

‎eng/common/core-templates/steps/install-microbuild.yml

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,18 @@ steps:
9191
script: |
9292
Write-Host "Copying Linux Path"
9393
$MBSIGN_APPFOLDER = '$(MBSIGN_APPFOLDER)'
94-
$MBSIGN_APPFOLDER = $MBSIGN_APPFOLDER -replace '/build', ''
95-
$MBSIGN_APPFOLDER = $MBSIGN_APPFOLDER + '/1.1.1032' + '/build'
94+
$MBSIGN_APPFOLDER = ($MBSIGN_APPFOLDER -replace '/build', '')
95+
96+
$versionRegex = '\d+\.\d+\.\d+'
97+
$package = Get-ChildItem -Path $MBSIGN_APPFOLDER -Directory |
98+
Where-Object { $_.Name -match $versionRegex }
99+
100+
if ($package.Count -ne 1) {
101+
Write-Host "There should be exactly one matching subfolder, but found $($package.Count)."
102+
exit 1
103+
}
104+
105+
$MBSIGN_APPFOLDER = $package[0].FullName + '/build'
96106
$MBSIGN_APPFOLDER | Write-Host
97107
$SignConfigPath = $MBSIGN_APPFOLDER + '/signconfig.xml'
98108
Copy-Item -Path "$(MBSIGN_APPFOLDER)/signconfig.xml" -Destination $SignConfigPath -Force

‎eng/common/post-build/publish-using-darc.ps1

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@ param(
66
[Parameter(Mandatory=$true)][string] $WaitPublishingFinish,
77
[Parameter(Mandatory=$false)][string] $ArtifactsPublishingAdditionalParameters,
88
[Parameter(Mandatory=$false)][string] $SymbolPublishingAdditionalParameters,
9-
[Parameter(Mandatory=$false)][string] $RequireDefaultChannels
9+
[Parameter(Mandatory=$false)][string] $RequireDefaultChannels,
10+
[Parameter(Mandatory=$false)][string] $SkipAssetsPublishing
1011
)
1112

1213
try {
@@ -39,6 +40,10 @@ try {
3940
$optionalParams.Add("--default-channels-required") | Out-Null
4041
}
4142

43+
if ("true" -eq $SkipAssetsPublishing) {
44+
$optionalParams.Add("--skip-assets-publishing") | Out-Null
45+
}
46+
4247
& $darc add-build-to-channel `
4348
--id $buildId `
4449
--publishing-infra-version $PublishingInfraVersion `

‎eng/common/sdl/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Microsoft.Guardian.Cli" version="0.109.0"/>
3+
<package id="Microsoft.Guardian.Cli" version="0.199.0"/>
44
</packages>

‎global.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"tools": {
3-
"dotnet": "10.0.100-preview.3.25167.3"
3+
"dotnet": "10.0.100-preview.3.25201.16"
44
},
55
"msbuild-sdks": {
6-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25206.1",
7-
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25206.1",
6+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25212.1",
7+
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25212.1",
88
"Microsoft.Build.Traversal": "3.4.0"
99
}
1010
}

0 commit comments

Comments
 (0)